From f5375e813d16d2dbabac6bfbc6dd0760c0891169 Mon Sep 17 00:00:00 2001 From: rgarcia Date: Wed, 1 Jun 2016 13:30:44 +0200 Subject: [PATCH 001/126] stores a proposal notification --- .../proposal_notifications_controller.rb | 29 +++++++++++++++++ app/models/proposal_notification.rb | 8 +++++ app/views/proposal_notifications/new.html.erb | 13 ++++++++ .../proposal_notifications/show.html.erb | 2 ++ config/locales/en.yml | 6 ++++ config/locales/es.yml | 6 ++++ config/locales/responders.en.yml | 2 ++ config/locales/responders.es.yml | 1 + config/routes.rb | 2 ++ ...601103338_create_proposal_notifications.rb | 12 +++++++ db/schema.rb | 11 ++++++- spec/factories.rb | 11 +++++-- spec/features/proposal_notifications_spec.rb | 31 +++++++++++++++++++ spec/models/proposal_notification_spec.rb | 25 +++++++++++++++ 14 files changed, 155 insertions(+), 4 deletions(-) create mode 100644 app/controllers/proposal_notifications_controller.rb create mode 100644 app/models/proposal_notification.rb create mode 100644 app/views/proposal_notifications/new.html.erb create mode 100644 app/views/proposal_notifications/show.html.erb create mode 100644 db/migrate/20160601103338_create_proposal_notifications.rb create mode 100644 spec/features/proposal_notifications_spec.rb create mode 100644 spec/models/proposal_notification_spec.rb diff --git a/app/controllers/proposal_notifications_controller.rb b/app/controllers/proposal_notifications_controller.rb new file mode 100644 index 000000000..bd83c941c --- /dev/null +++ b/app/controllers/proposal_notifications_controller.rb @@ -0,0 +1,29 @@ +class ProposalNotificationsController < ApplicationController + skip_authorization_check + + def new + @notification = ProposalNotification.new + @proposal = Proposal.find(params[:proposal_id]) + end + + def create + @notification = ProposalNotification.new(notification_params) + @proposal = Proposal.find(notification_params[:proposal_id]) + if @notification.save + redirect_to @notification, notice: I18n.t("flash.actions.create.proposal_notification") + else + render :new + end + end + + def show + @notification = ProposalNotification.find(params[:id]) + end + + private + + def notification_params + params.require(:proposal_notification).permit(:title, :body, :proposal_id) + end + +end \ No newline at end of file diff --git a/app/models/proposal_notification.rb b/app/models/proposal_notification.rb new file mode 100644 index 000000000..d31b2e1a5 --- /dev/null +++ b/app/models/proposal_notification.rb @@ -0,0 +1,8 @@ +class ProposalNotification < ActiveRecord::Base + belongs_to :author, class_name: 'User', foreign_key: 'author_id' + belongs_to :proposal + + validates :title, presence: true + validates :body, presence: true + validates :proposal, presence: true +end \ No newline at end of file diff --git a/app/views/proposal_notifications/new.html.erb b/app/views/proposal_notifications/new.html.erb new file mode 100644 index 000000000..728b022a1 --- /dev/null +++ b/app/views/proposal_notifications/new.html.erb @@ -0,0 +1,13 @@ +<%= form_for @notification do |f| %> + <%= render "shared/errors", resource: @notification %> + + <%= f.label :title, t("proposal_notifications.new.title_label") %> + <%= f.text_field :title, label: false %> + + <%= f.label :body, t("proposal_notifications.new.body_label") %> + <%= f.text_area :body, label: false %> + + <%= f.hidden_field :proposal_id, value: @proposal.id %> + + <%= f.submit t("proposal_notifications.new.submit_button") %> +<% end %> \ No newline at end of file diff --git a/app/views/proposal_notifications/show.html.erb b/app/views/proposal_notifications/show.html.erb new file mode 100644 index 000000000..e3c50e8cc --- /dev/null +++ b/app/views/proposal_notifications/show.html.erb @@ -0,0 +1,2 @@ +
<%= @notification.title %>
+
<%= @notification.body %>
\ No newline at end of file diff --git a/config/locales/en.yml b/config/locales/en.yml index 62fc521c5..725e8d08b 100755 --- a/config/locales/en.yml +++ b/config/locales/en.yml @@ -146,6 +146,7 @@ en: not_saved: 'prevented this %{resource} from being saved:' policy: Privacy Policy proposal: Proposal + proposal_notification: "Notification" spending_proposal: Spending proposal user: Account verification/sms: phone @@ -360,6 +361,11 @@ en: update: form: submit_button: Save changes + proposal_notifications: + new: + title_label: "Title" + body_label: "Message" + submit_button: "Send" shared: advanced_search: author_type: 'By author category' diff --git a/config/locales/es.yml b/config/locales/es.yml index 05e53fc2b..840dcf705 100755 --- a/config/locales/es.yml +++ b/config/locales/es.yml @@ -146,6 +146,7 @@ es: not_saved: 'impidieron guardar %{resource}:' policy: Política de privacidad proposal: la propuesta + proposal_notification: "la notificación" spending_proposal: la propuesta de gasto user: la cuenta verification/sms: el teléfono @@ -360,6 +361,11 @@ es: update: form: submit_button: Guardar cambios + proposal_notifications: + new: + title_label: "Título" + body_label: "Mensaje" + submit_button: "Enviar" shared: advanced_search: author_type: 'Por categoría de autor' diff --git a/config/locales/responders.en.yml b/config/locales/responders.en.yml index 3f83f746a..1155ff34a 100755 --- a/config/locales/responders.en.yml +++ b/config/locales/responders.en.yml @@ -6,7 +6,9 @@ en: notice: "%{resource_name} created successfully." debate: "Debate created successfully." proposal: "Proposal created successfully." + proposal_notification: "Your message has been sent correctly." spending_proposal: "Spending proposal created successfully. You can access it from %{activity}" + save_changes: notice: Changes saved update: diff --git a/config/locales/responders.es.yml b/config/locales/responders.es.yml index e57dacd31..948b6650f 100644 --- a/config/locales/responders.es.yml +++ b/config/locales/responders.es.yml @@ -6,6 +6,7 @@ es: notice: "%{resource_name} creado correctamente." debate: "Debate creado correctamente." proposal: "Propuesta creada correctamente." + proposal_notification: "Tu message ha sido enviado correctamente." spending_proposal: "Propuesta de inversión creada correctamente. Puedes acceder a ella desde %{activity}" save_changes: notice: Cambios guardados diff --git a/config/routes.rb b/config/routes.rb index 7d0a3a996..6cba48e42 100644 --- a/config/routes.rb +++ b/config/routes.rb @@ -93,6 +93,8 @@ Rails.application.routes.draw do put :mark_all_as_read, on: :collection end + resources :proposal_notifications, only: [:new, :create, :show] + resource :verification, controller: "verification", only: [:show] scope module: :verification do diff --git a/db/migrate/20160601103338_create_proposal_notifications.rb b/db/migrate/20160601103338_create_proposal_notifications.rb new file mode 100644 index 000000000..97760da6b --- /dev/null +++ b/db/migrate/20160601103338_create_proposal_notifications.rb @@ -0,0 +1,12 @@ +class CreateProposalNotifications < ActiveRecord::Migration + def change + create_table :proposal_notifications do |t| + t.string :title + t.text :body + t.integer :author_id + t.integer :proposal_id + + t.timestamps null: false + end + end +end diff --git a/db/schema.rb b/db/schema.rb index 10f10c7a8..91628725a 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: 20160518141543) do +ActiveRecord::Schema.define(version: 20160601103338) do # These are extensions that must be enabled in order to support this database enable_extension "plpgsql" @@ -260,6 +260,15 @@ ActiveRecord::Schema.define(version: 20160518141543) do add_index "organizations", ["user_id"], name: "index_organizations_on_user_id", using: :btree + create_table "proposal_notifications", force: :cascade do |t| + t.string "title" + t.text "body" + t.integer "author_id" + t.integer "proposal_id" + t.datetime "created_at", null: false + t.datetime "updated_at", null: false + end + create_table "proposals", force: :cascade do |t| t.string "title", limit: 80 t.text "description" diff --git a/spec/factories.rb b/spec/factories.rb index 62bea738f..0a9645dcb 100644 --- a/spec/factories.rb +++ b/spec/factories.rb @@ -1,5 +1,4 @@ FactoryGirl.define do - sequence(:document_number) { |n| "#{n.to_s.rjust(8, '0')}X" } factory :user do @@ -323,7 +322,13 @@ FactoryGirl.define do 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 + post_started_at Time.now - 7.days + post_ended_at Time.now + 7.days + end + + factory :proposal_notification do + title "Thank you for supporting my proposal" + body "Please let others know so we can make it happen" + proposal end end diff --git a/spec/features/proposal_notifications_spec.rb b/spec/features/proposal_notifications_spec.rb new file mode 100644 index 000000000..756fc3fdd --- /dev/null +++ b/spec/features/proposal_notifications_spec.rb @@ -0,0 +1,31 @@ +require 'rails_helper' + +feature 'Proposal Notifications' do + + scenario "Send a notification" do + noelia = create(:user) + vega = create(:user) + + proposal = create(:proposal) + #use correct path from my activity + visit new_proposal_notification_path(proposal_id: proposal.id) + + fill_in 'proposal_notification_title', with: "Thank you for supporting my proposal" + fill_in 'proposal_notification_body', with: "Please share it with others so we can make it happen!" + click_button "Send" + + expect(page).to have_content "Your message has been sent correctly." + expect(page).to have_content "Thank you for supporting my proposal" + expect(page).to have_content "Please share it with others so we can make it happen!" + end + + scenario "Error messages" do + proposal = create(:proposal) + + visit new_proposal_notification_path(proposal_id: proposal.id) + click_button "Send" + + expect(page).to have_content error_message + end + +end \ No newline at end of file diff --git a/spec/models/proposal_notification_spec.rb b/spec/models/proposal_notification_spec.rb new file mode 100644 index 000000000..5a7575219 --- /dev/null +++ b/spec/models/proposal_notification_spec.rb @@ -0,0 +1,25 @@ +require 'rails_helper' + +describe ProposalNotification do + let(:notification) { build(:proposal_notification) } + + it "should be valid" do + expect(notification).to be_valid + end + + it "should not be valid without a title" do + notification.title = nil + expect(notification).to_not be_valid + end + + it "should not be valid without a body" do + notification.body = nil + expect(notification).to_not be_valid + end + + it "should not be valid without an associated proposal" do + notification.proposal = nil + expect(notification).to_not be_valid + end + +end From 6e4ed0b8951e50a9d05f360a846f922a35c5c48a Mon Sep 17 00:00:00 2001 From: rgarcia Date: Wed, 1 Jun 2016 21:01:24 +0200 Subject: [PATCH 002/126] adds link to send message from my activity --- app/controllers/users_controller.rb | 7 +++- app/views/users/_proposals.html.erb | 11 ++++-- config/locales/en.yml | 6 ++-- config/locales/es.yml | 6 ++-- spec/features/proposal_notifications_spec.rb | 38 ++++++++++++++++++-- 5 files changed, 58 insertions(+), 10 deletions(-) diff --git a/app/controllers/users_controller.rb b/app/controllers/users_controller.rb index af4005e06..fbd77f184 100644 --- a/app/controllers/users_controller.rb +++ b/app/controllers/users_controller.rb @@ -3,6 +3,7 @@ class UsersController < ApplicationController load_and_authorize_resource helper_method :authorized_for_filter? + helper_method :author? helper_method :author_or_admin? def show @@ -65,8 +66,12 @@ class UsersController < ApplicationController @user.public_activity || authorized_current_user? end + def author? + @author ||= current_user && (current_user == @user) + end + def author_or_admin? - @author_or_admin ||= current_user && (current_user == @user || current_user.administrator?) + @author_or_admin ||= current_user && (author? || current_user.administrator?) end def authorized_current_user? diff --git a/app/views/users/_proposals.html.erb b/app/views/users/_proposals.html.erb index e0b54dcc4..d23e865ca 100644 --- a/app/views/users/_proposals.html.erb +++ b/app/views/users/_proposals.html.erb @@ -7,17 +7,24 @@ <%= proposal.summary %> + <% if author? %> + + <%= link_to t("users.proposals.send_message"), new_proposal_notification_path(proposal_id: proposal.id) %> + + <% end %> + <% if author_or_admin? %> <% if proposal.retired? %> - <%= t('users.show.retired') %> + <%= t('users.proposals.retired') %> <% else %> - <%= link_to t('users.show.retire'), + <%= link_to t('users.proposals.retire'), retire_form_proposal_path(proposal), class: 'delete' %> <% end %> <% end %> + <% end %> diff --git a/config/locales/en.yml b/config/locales/en.yml index 725e8d08b..40407f3fc 100755 --- a/config/locales/en.yml +++ b/config/locales/en.yml @@ -510,8 +510,10 @@ en: other: "%{count} Spending proposals" no_activity: User has no public activity private_activity: This user decided to keep the activity list private - retire: Retire - retired: Retired + proposals: + send_message: "Send message" + retire: "Retire" + retired: "Retired" votes: agree: I agree anonymous: Too many anonymous votes to admit vote %{verify_account}. diff --git a/config/locales/es.yml b/config/locales/es.yml index 840dcf705..4c26d7561 100755 --- a/config/locales/es.yml +++ b/config/locales/es.yml @@ -510,8 +510,10 @@ es: other: "%{count} Propuestas de inversión" no_activity: Usuario sin actividad pública private_activity: Este usuario ha decidido mantener en privado su lista de actividades - retire: Retirar - retired: Retirada + proposals: + send_message: "Enviar mensaje" + retire: "Retirar" + retired: "Retirada" votes: agree: Estoy de acuerdo anonymous: Demasiados votos anónimos, para poder votar %{verify_account}. diff --git a/spec/features/proposal_notifications_spec.rb b/spec/features/proposal_notifications_spec.rb index 756fc3fdd..d10beb6f4 100644 --- a/spec/features/proposal_notifications_spec.rb +++ b/spec/features/proposal_notifications_spec.rb @@ -6,9 +6,17 @@ feature 'Proposal Notifications' do noelia = create(:user) vega = create(:user) - proposal = create(:proposal) - #use correct path from my activity - visit new_proposal_notification_path(proposal_id: proposal.id) + author = create(:user) + proposal = create(:proposal, author: author) + + login_as(author) + visit root_path + + click_link "My activity" + + within("#proposal_#{proposal.id}") do + click_link "Send message" + end fill_in 'proposal_notification_title', with: "Thank you for supporting my proposal" fill_in 'proposal_notification_body', with: "Please share it with others so we can make it happen!" @@ -19,6 +27,30 @@ feature 'Proposal Notifications' do expect(page).to have_content "Please share it with others so we can make it happen!" end + context "Permissions" do + + scenario "Link to send the message" do + user = create(:user) + author = create(:user) + proposal = create(:proposal, author: author) + + login_as(author) + visit user_path(author) + + within("#proposal_#{proposal.id}") do + expect(page).to have_link "Send message" + end + + login_as(user) + visit user_path(author) + + within("#proposal_#{proposal.id}") do + expect(page).to_not have_link "Send message" + end + end + + end + scenario "Error messages" do proposal = create(:proposal) From ca26b3423b01a1889cee75ad66a676e0054f1c13 Mon Sep 17 00:00:00 2001 From: rgarcia Date: Wed, 1 Jun 2016 21:40:23 +0200 Subject: [PATCH 003/126] sends notification email to each voter --- .../proposal_notifications_controller.rb | 3 ++ app/mailers/mailer.rb | 8 +++++ app/models/proposal.rb | 4 +++ .../mailer/proposal_notification.html.erb | 2 ++ spec/features/emails_spec.rb | 36 +++++++++++++++++++ spec/features/proposal_notifications_spec.rb | 3 -- 6 files changed, 53 insertions(+), 3 deletions(-) create mode 100644 app/views/mailer/proposal_notification.html.erb diff --git a/app/controllers/proposal_notifications_controller.rb b/app/controllers/proposal_notifications_controller.rb index bd83c941c..fe6add7e2 100644 --- a/app/controllers/proposal_notifications_controller.rb +++ b/app/controllers/proposal_notifications_controller.rb @@ -10,6 +10,9 @@ class ProposalNotificationsController < ApplicationController @notification = ProposalNotification.new(notification_params) @proposal = Proposal.find(notification_params[:proposal_id]) if @notification.save + @proposal.voters.each do |voter| + Mailer.proposal_notification(@notification, voter).deliver_later + end redirect_to @notification, notice: I18n.t("flash.actions.create.proposal_notification") else render :new diff --git a/app/mailers/mailer.rb b/app/mailers/mailer.rb index 82abbb205..b8ca433ce 100644 --- a/app/mailers/mailer.rb +++ b/app/mailers/mailer.rb @@ -42,6 +42,14 @@ class Mailer < ApplicationMailer end end + def proposal_notification(notification, voter) + @notification = notification + + with_user(voter) do + mail(to: voter.email, subject: @notification.title) + end + end + private def with_user(user, &block) diff --git a/app/models/proposal.rb b/app/models/proposal.rb index d2b97f1c5..f9ef60303 100644 --- a/app/models/proposal.rb +++ b/app/models/proposal.rb @@ -97,6 +97,10 @@ class Proposal < ActiveRecord::Base cached_votes_up + physical_votes end + def voters + votes_for.voters + end + def editable? total_votes <= Setting["max_votes_for_proposal_edit"].to_i end diff --git a/app/views/mailer/proposal_notification.html.erb b/app/views/mailer/proposal_notification.html.erb new file mode 100644 index 000000000..30e8d8bc6 --- /dev/null +++ b/app/views/mailer/proposal_notification.html.erb @@ -0,0 +1,2 @@ +
<%= @notification.proposal.title %>
+
<%= @notification.body %>
diff --git a/spec/features/emails_spec.rb b/spec/features/emails_spec.rb index c6f0d3708..81e6560ff 100644 --- a/spec/features/emails_spec.rb +++ b/spec/features/emails_spec.rb @@ -148,4 +148,40 @@ feature 'Emails' do expect(email).to have_body_text(spending_proposal.feasible_explanation) end + scenario "Proposal notification" do + author = create(:user) + + noelia = create(:user) + vega = create(:user) + cristina = create(:user) + + proposal = create(:proposal, author: author) + + create(:vote, voter: noelia, votable: proposal, vote_flag: true) + create(:vote, voter: vega, votable: proposal, vote_flag: true) + + reset_mailer + + login_as(author) + visit root_path + + visit new_proposal_notification_path(proposal_id: proposal.id) + + fill_in 'proposal_notification_title', with: "Thank you for supporting my proposal" + fill_in 'proposal_notification_body', with: "Please share it with others so we can make it happen!" + click_button "Send" + + expect(page).to have_content "Your message has been sent correctly." + + expect(unread_emails_for(noelia.email).size).to eql parse_email_count(1) + expect(unread_emails_for(vega.email).size).to eql parse_email_count(1) + expect(unread_emails_for(cristina.email).size).to eql parse_email_count(0) + expect(unread_emails_for(author.email).size).to eql parse_email_count(0) + + email = open_last_email + expect(email).to have_subject("Thank you for supporting my proposal") + expect(email).to have_body_text("Please share it with others so we can make it happen!") + expect(email).to have_body_text(proposal.title) + end + end diff --git a/spec/features/proposal_notifications_spec.rb b/spec/features/proposal_notifications_spec.rb index d10beb6f4..b014aa162 100644 --- a/spec/features/proposal_notifications_spec.rb +++ b/spec/features/proposal_notifications_spec.rb @@ -3,9 +3,6 @@ require 'rails_helper' feature 'Proposal Notifications' do scenario "Send a notification" do - noelia = create(:user) - vega = create(:user) - author = create(:user) proposal = create(:proposal, author: author) From 0ef316de911252aa9c6df2c5b07cd3f205071601 Mon Sep 17 00:00:00 2001 From: Alberto Garcia Cabeza Date: Thu, 2 Jun 2016 13:36:41 +0200 Subject: [PATCH 004/126] Improves styles for proposal notifications --- .../mailer/proposal_notification.html.erb | 11 ++++++-- app/views/proposal_notifications/new.html.erb | 28 +++++++++++++------ .../proposal_notifications/show.html.erb | 13 +++++++-- config/locales/en.yml | 5 +++- config/locales/es.yml | 5 +++- 5 files changed, 47 insertions(+), 15 deletions(-) diff --git a/app/views/mailer/proposal_notification.html.erb b/app/views/mailer/proposal_notification.html.erb index 30e8d8bc6..59489840c 100644 --- a/app/views/mailer/proposal_notification.html.erb +++ b/app/views/mailer/proposal_notification.html.erb @@ -1,2 +1,9 @@ -
<%= @notification.proposal.title %>
-
<%= @notification.body %>
+ +

+ <%= @notification.proposal.title %> +

+ +

+ <%= @notification.body %> +

+ diff --git a/app/views/proposal_notifications/new.html.erb b/app/views/proposal_notifications/new.html.erb index 728b022a1..60f7e64e4 100644 --- a/app/views/proposal_notifications/new.html.erb +++ b/app/views/proposal_notifications/new.html.erb @@ -1,13 +1,23 @@ -<%= form_for @notification do |f| %> - <%= render "shared/errors", resource: @notification %> +
+
+ <%= render 'shared/back_link' %> - <%= f.label :title, t("proposal_notifications.new.title_label") %> - <%= f.text_field :title, label: false %> +

<%= t("proposal_notifications.new.title") %>

- <%= f.label :body, t("proposal_notifications.new.body_label") %> - <%= f.text_area :body, label: false %> + <%= form_for @notification do |f| %> + <%= render "shared/errors", resource: @notification %> - <%= f.hidden_field :proposal_id, value: @proposal.id %> + <%= f.label :title, t("proposal_notifications.new.title_label") %> + <%= f.text_field :title, label: false %> - <%= f.submit t("proposal_notifications.new.submit_button") %> -<% end %> \ No newline at end of file + <%= f.label :body, t("proposal_notifications.new.body_label") %> + <%= f.text_area :body, label: false, rows: "3" %> + + <%= f.hidden_field :proposal_id, value: @proposal.id %> + +
+ <%= f.submit t("proposal_notifications.new.submit_button"), class: "button expanded" %> +
+ <% end %> +
+
diff --git a/app/views/proposal_notifications/show.html.erb b/app/views/proposal_notifications/show.html.erb index e3c50e8cc..379b361fb 100644 --- a/app/views/proposal_notifications/show.html.erb +++ b/app/views/proposal_notifications/show.html.erb @@ -1,2 +1,11 @@ -
<%= @notification.title %>
-
<%= @notification.body %>
\ No newline at end of file +
+
+ <%= link_to user_path(current_user), class: "back" do %> + + <%= t("proposal_notifications.show.back") %> + <% end %> + +

<%= @notification.title %>

+

<%= @notification.body %>

+
+
diff --git a/config/locales/en.yml b/config/locales/en.yml index 40407f3fc..40b32f712 100755 --- a/config/locales/en.yml +++ b/config/locales/en.yml @@ -363,9 +363,12 @@ en: submit_button: Save changes proposal_notifications: new: + title: "Send message" title_label: "Title" body_label: "Message" - submit_button: "Send" + submit_button: "Send message" + show: + back: "Go back to my activity" shared: advanced_search: author_type: 'By author category' diff --git a/config/locales/es.yml b/config/locales/es.yml index 4c26d7561..5dc388853 100755 --- a/config/locales/es.yml +++ b/config/locales/es.yml @@ -363,9 +363,12 @@ es: submit_button: Guardar cambios proposal_notifications: new: + title: "Enviar mensaje" title_label: "Título" body_label: "Mensaje" - submit_button: "Enviar" + submit_button: "Enviar mensaje" + show: + back: "Volver a mi actividad" shared: advanced_search: author_type: 'Por categoría de autor' From fc6cc090f8ab9dbb0d18484f06a818f4e31e6dab Mon Sep 17 00:00:00 2001 From: rgarcia Date: Mon, 6 Jun 2016 12:21:48 +0200 Subject: [PATCH 005/126] displays notifications in proposal view --- app/controllers/proposals_controller.rb | 2 +- app/models/proposal.rb | 5 +++++ app/views/proposals/_notifications.html.erb | 6 ++++++ app/views/proposals/show.html.erb | 1 + spec/features/proposal_notifications_spec.rb | 14 ++++++++++++++ 5 files changed, 27 insertions(+), 1 deletion(-) create mode 100644 app/views/proposals/_notifications.html.erb diff --git a/app/controllers/proposals_controller.rb b/app/controllers/proposals_controller.rb index 0b350f687..578395ab3 100644 --- a/app/controllers/proposals_controller.rb +++ b/app/controllers/proposals_controller.rb @@ -2,7 +2,6 @@ class ProposalsController < ApplicationController include CommentableActions include FlagActions - before_action :parse_search_terms, only: [:index, :suggest] before_action :parse_advanced_search_terms, only: :index before_action :parse_tag_filter, only: :index @@ -22,6 +21,7 @@ class ProposalsController < ApplicationController def show super + @notifications = @proposal.notifications redirect_to proposal_path(@proposal), status: :moved_permanently if request.path != proposal_path(@proposal) end diff --git a/app/models/proposal.rb b/app/models/proposal.rb index f9ef60303..7d2bddb30 100644 --- a/app/models/proposal.rb +++ b/app/models/proposal.rb @@ -16,6 +16,7 @@ class Proposal < ActiveRecord::Base belongs_to :author, -> { with_hidden }, class_name: 'User', foreign_key: 'author_id' belongs_to :geozone has_many :comments, as: :commentable + has_many :proposal_notifications validates :title, presence: true validates :question, presence: true @@ -154,6 +155,10 @@ class Proposal < ActiveRecord::Base Setting['votes_for_proposal_success'].to_i end + def notifications + proposal_notifications + end + protected def set_responsible_name diff --git a/app/views/proposals/_notifications.html.erb b/app/views/proposals/_notifications.html.erb new file mode 100644 index 000000000..576ed8cc6 --- /dev/null +++ b/app/views/proposals/_notifications.html.erb @@ -0,0 +1,6 @@ +
+ <% @notifications.each do |notification| %> +
<%= notification.title %>
+
<%= notification.body %>
+ <% end %> +
\ No newline at end of file diff --git a/app/views/proposals/show.html.erb b/app/views/proposals/show.html.erb index cb2773c65..9d8c3b739 100644 --- a/app/views/proposals/show.html.erb +++ b/app/views/proposals/show.html.erb @@ -118,4 +118,5 @@ <% end %> +<%= render "proposals/notifications" %> <%= render "proposals/comments" %> diff --git a/spec/features/proposal_notifications_spec.rb b/spec/features/proposal_notifications_spec.rb index b014aa162..1662475b1 100644 --- a/spec/features/proposal_notifications_spec.rb +++ b/spec/features/proposal_notifications_spec.rb @@ -24,6 +24,20 @@ feature 'Proposal Notifications' do expect(page).to have_content "Please share it with others so we can make it happen!" end + scenario "Show notifications" do + proposal = create(:proposal) + notification1 = create(:proposal_notification, proposal: proposal, title: "Hey guys", body: "Just wanted to let you know that...") + notification2 = create(:proposal_notification, proposal: proposal, title: "Another update", body: "We are almost there please share with your peoples!") + + visit proposal_path(proposal) + + expect(page).to have_content "Hey guys" + expect(page).to have_content "Just wanted to let you know that..." + + expect(page).to have_content "Another update" + expect(page).to have_content "We are almost there please share with your peoples!" + end + context "Permissions" do scenario "Link to send the message" do From ad697cd2c190b2079b77f769783ac7c1bb75cb8d Mon Sep 17 00:00:00 2001 From: rgarcia Date: Mon, 6 Jun 2016 12:55:33 +0200 Subject: [PATCH 006/126] adds preference to receive proposal notifications --- app/controllers/account_controller.rb | 2 +- .../proposal_notifications_controller.rb | 4 +- app/views/account/show.html.erb | 25 +++++-- config/locales/en.yml | 1 + config/locales/es.yml | 1 + ...email_on_proposal_notification_to_users.rb | 5 ++ db/schema.rb | 35 +++++----- spec/features/account_spec.rb | 11 +-- spec/features/emails_spec.rb | 68 ++++++++++++------- spec/models/user_spec.rb | 6 ++ 10 files changed, 107 insertions(+), 51 deletions(-) create mode 100644 db/migrate/20160606102427_add_email_on_proposal_notification_to_users.rb diff --git a/app/controllers/account_controller.rb b/app/controllers/account_controller.rb index 9a0f89bae..d1ac9c9c4 100644 --- a/app/controllers/account_controller.rb +++ b/app/controllers/account_controller.rb @@ -25,7 +25,7 @@ class AccountController < ApplicationController if @account.organization? params.require(:account).permit(:phone_number, :email_on_comment, :email_on_comment_reply, :newsletter, organization_attributes: [:name, :responsible_name]) else - params.require(:account).permit(:username, :public_activity, :email_on_comment, :email_on_comment_reply, :newsletter) + params.require(:account).permit(:username, :public_activity, :email_on_comment, :email_on_comment_reply, :email_on_proposal_notification, :newsletter) end end diff --git a/app/controllers/proposal_notifications_controller.rb b/app/controllers/proposal_notifications_controller.rb index fe6add7e2..f1249c707 100644 --- a/app/controllers/proposal_notifications_controller.rb +++ b/app/controllers/proposal_notifications_controller.rb @@ -11,7 +11,9 @@ class ProposalNotificationsController < ApplicationController @proposal = Proposal.find(notification_params[:proposal_id]) if @notification.save @proposal.voters.each do |voter| - Mailer.proposal_notification(@notification, voter).deliver_later + if voter.email_on_proposal_notification? + Mailer.proposal_notification(@notification, voter).deliver_later + end end redirect_to @notification, notice: I18n.t("flash.actions.create.proposal_notification") else diff --git a/app/views/account/show.html.erb b/app/views/account/show.html.erb index f0d2b6abc..b3a84dede 100644 --- a/app/views/account/show.html.erb +++ b/app/views/account/show.html.erb @@ -34,7 +34,9 @@
<%= f.label :public_activity do %> <%= f.check_box :public_activity, title: t('account.show.public_activity_label'), label: false %> - <%= t("account.show.public_activity_label") %> + + <%= t("account.show.public_activity_label") %> + <% end %>
@@ -43,21 +45,36 @@
<%= f.label :email_on_comment do %> <%= f.check_box :email_on_comment, title: t('account.show.email_on_comment_label'), label: false %> - <%= t("account.show.email_on_comment_label") %> + + <%= t("account.show.email_on_comment_label") %> + <% end %>
<%= f.label :email_on_comment_reply do %> <%= f.check_box :email_on_comment_reply, title: t('account.show.email_on_comment_reply_label'), label: false %> - <%= t("account.show.email_on_comment_reply_label") %> + + <%= t("account.show.email_on_comment_reply_label") %> + <% end %>
<%= f.label :email_newsletter_subscribed do %> <%= f.check_box :newsletter, title: t('account.show.subscription_to_website_newsletter_label'), label: false %> - <%= t("account.show.subscription_to_website_newsletter_label") %> + + <%= t("account.show.subscription_to_website_newsletter_label") %> + + <% end %> +
+ +
+ <%= f.label :email_on_proposal_notification do %> + <%= f.check_box :email_on_proposal_notification, title: t('account.show.email_on_proposal_notification_label'), label: false %> + + <%= t("account.show.email_on_proposal_notification_label") %> + <% end %>
diff --git a/config/locales/en.yml b/config/locales/en.yml index 40b32f712..5a0dec0c6 100755 --- a/config/locales/en.yml +++ b/config/locales/en.yml @@ -15,6 +15,7 @@ en: public_activity_label: Keep my list of activities public save_changes_submit: Save changes subscription_to_website_newsletter_label: Receive by email website relevant information + email_on_proposal_notification_label: Receive by email notifications about proposals title: My account user_permission_debates: Participate on debates user_permission_info: With your account you can... diff --git a/config/locales/es.yml b/config/locales/es.yml index 5dc388853..909e20bbc 100755 --- a/config/locales/es.yml +++ b/config/locales/es.yml @@ -15,6 +15,7 @@ es: public_activity_label: Mostrar públicamente mi lista de actividades save_changes_submit: Guardar cambios subscription_to_website_newsletter_label: Recibir emails con información interesante sobre la web + email_on_proposal_notification_label: Recibir emails con notificaciones sobre propuestas title: Mi cuenta user_permission_debates: Participar en debates user_permission_info: Con tu cuenta ya puedes... diff --git a/db/migrate/20160606102427_add_email_on_proposal_notification_to_users.rb b/db/migrate/20160606102427_add_email_on_proposal_notification_to_users.rb new file mode 100644 index 000000000..84753eb50 --- /dev/null +++ b/db/migrate/20160606102427_add_email_on_proposal_notification_to_users.rb @@ -0,0 +1,5 @@ +class AddEmailOnProposalNotificationToUsers < ActiveRecord::Migration + def change + add_column :users, :email_on_proposal_notification, :boolean, default: true + end +end diff --git a/db/schema.rb b/db/schema.rb index 91628725a..a8e09434e 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: 20160601103338) do +ActiveRecord::Schema.define(version: 20160606102427) do # These are extensions that must be enabled in order to support this database enable_extension "plpgsql" @@ -402,30 +402,30 @@ ActiveRecord::Schema.define(version: 20160601103338) do add_index "tolk_translations", ["phrase_id", "locale_id"], name: "index_tolk_translations_on_phrase_id_and_locale_id", unique: true, using: :btree create_table "users", force: :cascade do |t| - t.string "email", default: "" - t.string "encrypted_password", default: "", null: false + t.string "email", default: "" + t.string "encrypted_password", default: "", null: false t.string "reset_password_token" t.datetime "reset_password_sent_at" t.datetime "remember_created_at" - t.integer "sign_in_count", default: 0, null: false + t.integer "sign_in_count", default: 0, null: false t.datetime "current_sign_in_at" t.datetime "last_sign_in_at" t.string "current_sign_in_ip" t.string "last_sign_in_ip" - t.datetime "created_at", null: false - t.datetime "updated_at", null: false + t.datetime "created_at", null: false + t.datetime "updated_at", null: false t.string "confirmation_token" t.datetime "confirmed_at" t.datetime "confirmation_sent_at" t.string "unconfirmed_email" - t.boolean "email_on_comment", default: false - t.boolean "email_on_comment_reply", default: false - t.string "phone_number", limit: 30 + t.boolean "email_on_comment", default: false + t.boolean "email_on_comment_reply", default: false + t.string "phone_number", limit: 30 t.string "official_position" - t.integer "official_level", default: 0 + t.integer "official_level", default: 0 t.datetime "hidden_at" t.string "sms_confirmation_code" - t.string "username", limit: 60 + t.string "username", limit: 60 t.string "document_number" t.string "document_type" t.datetime "residence_verified_at" @@ -436,20 +436,21 @@ ActiveRecord::Schema.define(version: 20160601103338) do t.datetime "letter_requested_at" t.datetime "confirmed_hide_at" t.string "letter_verification_code" - t.integer "failed_census_calls_count", default: 0 + t.integer "failed_census_calls_count", default: 0 t.datetime "level_two_verified_at" t.string "erase_reason" t.datetime "erased_at" - t.boolean "public_activity", default: true - t.boolean "newsletter", default: true - t.integer "notifications_count", default: 0 - t.boolean "registering_with_oauth", default: false + t.boolean "public_activity", default: true + t.boolean "newsletter", default: true + t.integer "notifications_count", default: 0 + t.boolean "registering_with_oauth", default: false t.string "locale" t.string "oauth_email" t.integer "geozone_id" t.string "redeemable_code" - t.string "gender", limit: 10 + t.string "gender", limit: 10 t.datetime "date_of_birth" + t.boolean "email_on_proposal_notification", default: true end add_index "users", ["confirmation_token"], name: "index_users_on_confirmation_token", unique: true, using: :btree diff --git a/spec/features/account_spec.rb b/spec/features/account_spec.rb index bc9c38dae..f5ba747fb 100644 --- a/spec/features/account_spec.rb +++ b/spec/features/account_spec.rb @@ -35,6 +35,7 @@ feature 'Account' do fill_in 'account_username', with: 'Larry Bird' check 'account_email_on_comment' check 'account_email_on_comment_reply' + uncheck 'account_email_on_proposal_notification' click_button 'Save changes' expect(page).to have_content "Changes saved" @@ -42,8 +43,9 @@ feature 'Account' do visit account_path expect(page).to have_selector("input[value='Larry Bird']") - expect(page).to have_selector("input[id='account_email_on_comment'][value='1']") - expect(page).to have_selector("input[id='account_email_on_comment_reply'][value='1']") + expect(find("#account_email_on_comment")).to be_checked + expect(find("#account_email_on_comment_reply")).to be_checked + expect(find("#account_email_on_proposal_notification")).to_not be_checked end scenario 'Edit Organization' do @@ -53,6 +55,7 @@ feature 'Account' do fill_in 'account_organization_attributes_name', with: 'Google' check 'account_email_on_comment' check 'account_email_on_comment_reply' + click_button 'Save changes' expect(page).to have_content "Changes saved" @@ -60,8 +63,8 @@ feature 'Account' do visit account_path expect(page).to have_selector("input[value='Google']") - expect(page).to have_selector("input[id='account_email_on_comment'][value='1']") - expect(page).to have_selector("input[id='account_email_on_comment_reply'][value='1']") + expect(find("#account_email_on_comment")).to be_checked + expect(find("#account_email_on_comment_reply")).to be_checked end scenario "Errors on edit" do diff --git a/spec/features/emails_spec.rb b/spec/features/emails_spec.rb index 81e6560ff..e61403635 100644 --- a/spec/features/emails_spec.rb +++ b/spec/features/emails_spec.rb @@ -148,40 +148,60 @@ feature 'Emails' do expect(email).to have_body_text(spending_proposal.feasible_explanation) end - scenario "Proposal notification" do - author = create(:user) + context "Proposal notifications" do - noelia = create(:user) - vega = create(:user) - cristina = create(:user) + scenario "Proposal notification" do + author = create(:user) - proposal = create(:proposal, author: author) + noelia = create(:user) + vega = create(:user) + cristina = create(:user) - create(:vote, voter: noelia, votable: proposal, vote_flag: true) - create(:vote, voter: vega, votable: proposal, vote_flag: true) + proposal = create(:proposal, author: author) - reset_mailer + create(:vote, voter: noelia, votable: proposal, vote_flag: true) + create(:vote, voter: vega, votable: proposal, vote_flag: true) - login_as(author) - visit root_path + reset_mailer - visit new_proposal_notification_path(proposal_id: proposal.id) + login_as(author) + visit root_path - fill_in 'proposal_notification_title', with: "Thank you for supporting my proposal" - fill_in 'proposal_notification_body', with: "Please share it with others so we can make it happen!" - click_button "Send" + visit new_proposal_notification_path(proposal_id: proposal.id) - expect(page).to have_content "Your message has been sent correctly." + fill_in 'proposal_notification_title', with: "Thank you for supporting my proposal" + fill_in 'proposal_notification_body', with: "Please share it with others so we can make it happen!" + click_button "Send message" - expect(unread_emails_for(noelia.email).size).to eql parse_email_count(1) - expect(unread_emails_for(vega.email).size).to eql parse_email_count(1) - expect(unread_emails_for(cristina.email).size).to eql parse_email_count(0) - expect(unread_emails_for(author.email).size).to eql parse_email_count(0) + expect(page).to have_content "Your message has been sent correctly." - email = open_last_email - expect(email).to have_subject("Thank you for supporting my proposal") - expect(email).to have_body_text("Please share it with others so we can make it happen!") - expect(email).to have_body_text(proposal.title) + expect(unread_emails_for(noelia.email).size).to eql parse_email_count(1) + expect(unread_emails_for(vega.email).size).to eql parse_email_count(1) + expect(unread_emails_for(cristina.email).size).to eql parse_email_count(0) + expect(unread_emails_for(author.email).size).to eql parse_email_count(0) + + email = open_last_email + expect(email).to have_subject("Thank you for supporting my proposal") + expect(email).to have_body_text("Please share it with others so we can make it happen!") + expect(email).to have_body_text(proposal.title) + end + + scenario "Do not send email about proposal notifications unless set in preferences", :js do + author = create(:user) + voter = create(:user, email_on_proposal_notification: false) + + proposal = create(:proposal) + create(:vote, voter: voter, votable: proposal, vote_flag: true) + + login_as(author) + visit new_proposal_notification_path(proposal_id: proposal.id) + + fill_in 'proposal_notification_title', with: "Thank you for supporting my proposal" + fill_in 'proposal_notification_body', with: "Please share it with others so we can make it happen!" + click_button "Send message" + + expect { open_last_email }.to raise_error "No email has been sent!" + end end end diff --git a/spec/models/user_spec.rb b/spec/models/user_spec.rb index 054e043f9..ca46ff68f 100644 --- a/spec/models/user_spec.rb +++ b/spec/models/user_spec.rb @@ -83,6 +83,12 @@ describe User do expect(subject.newsletter).to eq(true) end end + + describe 'email_on_proposal_notification' do + it 'should be true by default' do + expect(subject.email_on_proposal_notification).to eq(true) + end + end end describe "administrator?" do From 86f0cae7bbdd78141f0cd8d3bb7f34b60c9d7c41 Mon Sep 17 00:00:00 2001 From: rgarcia Date: Mon, 6 Jun 2016 13:52:40 +0200 Subject: [PATCH 007/126] fixes specs --- app/views/proposals/_notifications.html.erb | 14 ++++++++------ spec/features/proposal_notifications_spec.rb | 4 ++-- 2 files changed, 10 insertions(+), 8 deletions(-) diff --git a/app/views/proposals/_notifications.html.erb b/app/views/proposals/_notifications.html.erb index 576ed8cc6..9e3af3e9e 100644 --- a/app/views/proposals/_notifications.html.erb +++ b/app/views/proposals/_notifications.html.erb @@ -1,6 +1,8 @@ -
- <% @notifications.each do |notification| %> -
<%= notification.title %>
-
<%= notification.body %>
- <% end %> -
\ No newline at end of file +<% if @notifications.present? %> +
+ <% @notifications.each do |notification| %> +
<%= notification.title %>
+
<%= notification.body %>
+ <% end %> +
+<% end %> \ No newline at end of file diff --git a/spec/features/proposal_notifications_spec.rb b/spec/features/proposal_notifications_spec.rb index 1662475b1..3046c6ab5 100644 --- a/spec/features/proposal_notifications_spec.rb +++ b/spec/features/proposal_notifications_spec.rb @@ -17,7 +17,7 @@ feature 'Proposal Notifications' do fill_in 'proposal_notification_title', with: "Thank you for supporting my proposal" fill_in 'proposal_notification_body', with: "Please share it with others so we can make it happen!" - click_button "Send" + click_button "Send message" expect(page).to have_content "Your message has been sent correctly." expect(page).to have_content "Thank you for supporting my proposal" @@ -66,7 +66,7 @@ feature 'Proposal Notifications' do proposal = create(:proposal) visit new_proposal_notification_path(proposal_id: proposal.id) - click_button "Send" + click_button "Send message" expect(page).to have_content error_message end From a2c9756c1873fe09ac02e09f58f62a140dcd890a Mon Sep 17 00:00:00 2001 From: rgarcia Date: Mon, 6 Jun 2016 16:50:00 +0200 Subject: [PATCH 008/126] displays message about receivers --- app/views/proposal_notifications/new.html.erb | 8 ++++++++ config/locales/en.yml | 2 ++ config/locales/es.yml | 2 ++ spec/features/proposal_notifications_spec.rb | 13 +++++++++++++ 4 files changed, 25 insertions(+) diff --git a/app/views/proposal_notifications/new.html.erb b/app/views/proposal_notifications/new.html.erb index 60f7e64e4..f8be10c2e 100644 --- a/app/views/proposal_notifications/new.html.erb +++ b/app/views/proposal_notifications/new.html.erb @@ -4,6 +4,14 @@

<%= t("proposal_notifications.new.title") %>

+

+ <%= t("proposal_notifications.new.info_about_receivers", + count: @proposal.voters.count) %> + + <%= link_to t("proposal_notifications.new.proposal_page"), + proposal_path(@proposal) %> +

+ <%= form_for @notification do |f| %> <%= render "shared/errors", resource: @notification %> diff --git a/config/locales/en.yml b/config/locales/en.yml index 5a0dec0c6..a830de2d8 100755 --- a/config/locales/en.yml +++ b/config/locales/en.yml @@ -368,6 +368,8 @@ en: title_label: "Title" body_label: "Message" submit_button: "Send message" + info_about_receivers: "This message will be send to %{count} people and it will be visible in " + proposal_page: "the proposal's page" show: back: "Go back to my activity" shared: diff --git a/config/locales/es.yml b/config/locales/es.yml index 909e20bbc..670aaa2d6 100755 --- a/config/locales/es.yml +++ b/config/locales/es.yml @@ -368,6 +368,8 @@ es: title_label: "Título" body_label: "Mensaje" submit_button: "Enviar mensaje" + info_about_receivers: "Este mensaje se enviará a %{count} usuarios y se publicará en " + proposal_page: "la página de la propuesta" show: back: "Volver a mi actividad" shared: diff --git a/spec/features/proposal_notifications_spec.rb b/spec/features/proposal_notifications_spec.rb index 3046c6ab5..f40e0b81e 100644 --- a/spec/features/proposal_notifications_spec.rb +++ b/spec/features/proposal_notifications_spec.rb @@ -38,6 +38,19 @@ feature 'Proposal Notifications' do expect(page).to have_content "We are almost there please share with your peoples!" end + scenario "Message about receivers" do + author = create(:user) + proposal = create(:proposal, author: author) + + 7.times { create(:vote, votable: proposal, vote_flag: true) } + + login_as(author) + visit new_proposal_notification_path(proposal_id: proposal.id) + + expect(page).to have_content "This message will be send to 7 people and it will be visible in the proposal's page" + expect(page).to have_link("the proposal's page", href: proposal_path(proposal)) + end + context "Permissions" do scenario "Link to send the message" do From 84f9dcaa7650855b0dafb1ccc82a6548515646a6 Mon Sep 17 00:00:00 2001 From: Alberto Garcia Cabeza Date: Mon, 6 Jun 2016 17:26:48 +0200 Subject: [PATCH 009/126] Adds tabs for notifications on proposal show --- app/assets/stylesheets/_settings.scss | 136 ++++++++++---------- app/assets/stylesheets/layout.scss | 32 ++++- app/assets/stylesheets/participation.scss | 10 ++ app/views/proposals/_comments.html.erb | 12 +- app/views/proposals/_filter_subnav.html.erb | 22 ++++ app/views/proposals/_notifications.html.erb | 17 ++- app/views/proposals/show.html.erb | 13 +- app/views/users/_proposals.html.erb | 5 +- config/locales/en.yml | 2 + config/locales/es.yml | 2 + 10 files changed, 166 insertions(+), 85 deletions(-) create mode 100644 app/views/proposals/_filter_subnav.html.erb diff --git a/app/assets/stylesheets/_settings.scss b/app/assets/stylesheets/_settings.scss index 22e7ac8de..1e181e1c1 100644 --- a/app/assets/stylesheets/_settings.scss +++ b/app/assets/stylesheets/_settings.scss @@ -3,6 +3,7 @@ // // Table of Contents: // +// 0. Custom variables // 1. Global // 2. Breakpoints // 3. The Grid @@ -43,6 +44,70 @@ @import 'util/util'; +// 0. Custom variables +// -------------------- + +$base-font-size: rem-calc(17); +$base-line-height: rem-calc(26); +$small-font-size: rem-calc(14); +$line-height: rem-calc(24); + +$brand: #004A83; +$body: #E9E9E9; +$background: #EDEFF0; +$border: #DEE0E3; +$dark: darken($brand, 10%); + +$text: #222222; +$text-medium: #999999; +$text-light: #CCCCCC; + +$link: #2895F1; +$link-hover: #2178BF; + +$debates: #008CCF; +$votes-bg: #26AEEE; +$votes-border: #1F94CB; + +$votes-like: #7BD2A8; +$votes-like-act: #5D9E7F; +$votes-unlike: #EF8585; +$votes-unlike-act: #BD6A6A; + +$delete: #F04124; +$check: #46DB91; + +$proposals: #FFA42D; +$proposals-border: #CC8425; + +$budget: #454372; +$budget-hover: #7571BF; + +$highlight: #E7F2FC; +$featured: #FED900; + +$footer-bg: #DEE0E2; +$footer-color: #171819; +$footer-link: #454A4C; +$footer-border: #BFC1C3; + +$success-bg: #DFF0D8; +$success-border: #D6E9C6; +$color-success: #3C763D; + +$info-bg: #D9EDF7; +$info-border: #BCE8F1; +$color-info: #31708F; + +$warning-bg: #FCF8E3; +$warning-border: #FAEBCC; +$color-warning: #8A6D3B; + +$alert-bg: #F2DEDE; +$alert-border: #EBCCD1; +$color-alert: #A94442; + + // 1. Global // --------- @@ -510,13 +575,13 @@ $show-header-for-stacked: false; $tab-margin: 0; $tab-background: $white; -$tab-background-active: $light-gray; -$tab-item-font-size: rem-calc(12); +$tab-background-active: $white; +$tab-item-font-size: $base-font-size; $tab-item-background-hover: $white; -$tab-item-padding: 1.25rem 1.5rem; +$tab-item-padding: $line-height/2 0; $tab-expand-max: 6; $tab-content-background: $white; -$tab-content-border: $light-gray; +$tab-content-border: $border; $tab-content-color: foreground($tab-background, $primary-color); $tab-content-padding: 1rem; @@ -563,66 +628,3 @@ $topbar-submenu-background: $topbar-background; $topbar-title-spacing: 1rem; $topbar-input-width: 200px; $topbar-unstack-breakpoint: medium; - -// 37. Custom variables -// -------------------- - -$base-font-size: rem-calc(17); -$base-line-height: rem-calc(26); -$small-font-size: rem-calc(14); -$line-height: rem-calc(24); - -$brand: #004A83; -$body: #E9E9E9; -$background: #EDEFF0; -$border: #DEE0E3; -$dark: darken($brand, 10%); - -$text: #222222; -$text-medium: #999999; -$text-light: #CCCCCC; - -$link: #2895F1; -$link-hover: #2178BF; - -$debates: #008CCF; -$votes-bg: #26AEEE; -$votes-border: #1F94CB; - -$votes-like: #7BD2A8; -$votes-like-act: #5D9E7F; -$votes-unlike: #EF8585; -$votes-unlike-act: #BD6A6A; - -$delete: #F04124; -$check: #46DB91; - -$proposals: #FFA42D; -$proposals-border: #CC8425; - -$budget: #454372; -$budget-hover: #7571BF; - -$highlight: #E7F2FC; -$featured: #FED900; - -$footer-bg: #DEE0E2; -$footer-color: #171819; -$footer-link: #454A4C; -$footer-border: #BFC1C3; - -$success-bg: #DFF0D8; -$success-border: #D6E9C6; -$color-success: #3C763D; - -$info-bg: #D9EDF7; -$info-border: #BCE8F1; -$color-info: #31708F; - -$warning-bg: #FCF8E3; -$warning-border: #FAEBCC; -$color-warning: #8A6D3B; - -$alert-bg: #F2DEDE; -$alert-border: #EBCCD1; -$color-alert: #A94442; diff --git a/app/assets/stylesheets/layout.scss b/app/assets/stylesheets/layout.scss index 42f6f177d..ea426cf45 100644 --- a/app/assets/stylesheets/layout.scss +++ b/app/assets/stylesheets/layout.scss @@ -219,6 +219,35 @@ a { float: left; } +.tabs-content { + border: 0; +} + +.tabs { + border: { + left: 0; + right: 0; + top: 0; + }; + + .tabs-title > a { + color: $text-medium; + margin-bottom: rem-calc(-1); + margin-right: $line-height; + + &[aria-selected='true'], + &.is-active { + color: $brand; + border-bottom: 2px solid $brand; + font-weight: bold; + } + } + + h2 { + font-size: $base-font-size; + } +} + // 02. Header // ---------- @@ -1460,7 +1489,6 @@ table { .comments { background: $white; background-repeat: repeat-x; - padding-top: $line-height; padding-bottom: $line-height*4; h2 { @@ -1647,7 +1675,7 @@ table { &:first-child { padding-left: $line-height*1.5; - width: 80%; + width: 75%; } &:before { diff --git a/app/assets/stylesheets/participation.scss b/app/assets/stylesheets/participation.scss index 502fe62aa..6e5b4273a 100644 --- a/app/assets/stylesheets/participation.scss +++ b/app/assets/stylesheets/participation.scss @@ -715,6 +715,16 @@ } } +.more-info { + clear: both; + color: $text-medium; + font-size: $small-font-size; + + a { + color: $text-medium; + } +} + .debate { .votes { diff --git a/app/views/proposals/_comments.html.erb b/app/views/proposals/_comments.html.erb index 31f1cb8ba..094814cf1 100644 --- a/app/views/proposals/_comments.html.erb +++ b/app/views/proposals/_comments.html.erb @@ -1,11 +1,13 @@ <% cache [locale_and_user_status, @current_order, commentable_cache_key(@proposal), @comment_tree.comments, @comment_tree.comment_authors, @proposal.comments_count, @comment_flags] do %> -
+
-

- <%= t("proposals.show.comments_title") %> - (<%= @proposal.comments_count %>) -

+ <% if @notifications.blank? %> +

+ <%= t("proposals.show.comments_title") %> + (<%= @proposal.comments_count %>) +

+ <% end %> <%= render 'shared/wide_order_selector', i18n_namespace: "comments" %> diff --git a/app/views/proposals/_filter_subnav.html.erb b/app/views/proposals/_filter_subnav.html.erb new file mode 100644 index 000000000..b7bc85dd6 --- /dev/null +++ b/app/views/proposals/_filter_subnav.html.erb @@ -0,0 +1,22 @@ +
+
+
    +
  • + <%= link_to "#tab-comments" do %> +

    + <%= t("proposals.show.comments_tab") %> + (<%= @proposal.comments_count %>) +

    + <% end %> +
    • +
  • + <%= link_to "#tab-notifications" do %> +

    + <%= t("proposals.show.notifications_tab") %> + (<%= @notifications.count %>) +

    + <% end %> +
    • +
+
+
diff --git a/app/views/proposals/_notifications.html.erb b/app/views/proposals/_notifications.html.erb index 9e3af3e9e..44bb9f4a2 100644 --- a/app/views/proposals/_notifications.html.erb +++ b/app/views/proposals/_notifications.html.erb @@ -1,8 +1,11 @@ -<% if @notifications.present? %> -
- <% @notifications.each do |notification| %> -
<%= notification.title %>
-
<%= notification.body %>
- <% end %> +
+
+
+ <% @notifications.each do |notification| %> +

<%= notification.title %>

+

<%= notification.created_at.to_date %>

+

<%= notification.body %>

+ <% end %> +
-<% end %> \ No newline at end of file +
diff --git a/app/views/proposals/show.html.erb b/app/views/proposals/show.html.erb index 9d8c3b739..2a6ae7185 100644 --- a/app/views/proposals/show.html.erb +++ b/app/views/proposals/show.html.erb @@ -118,5 +118,14 @@
<% end %> -<%= render "proposals/notifications" %> -<%= render "proposals/comments" %> + +
+ <% if @notifications.present? %> + <%= render "proposals/filter_subnav" %> + <%= render "proposals/notifications" %> + <% end %> + +
+ <%= render "proposals/comments" %> +
+
diff --git a/app/views/users/_proposals.html.erb b/app/views/users/_proposals.html.erb index d23e865ca..a56b096f6 100644 --- a/app/views/users/_proposals.html.erb +++ b/app/views/users/_proposals.html.erb @@ -9,7 +9,8 @@ <% if author? %> - <%= link_to t("users.proposals.send_message"), new_proposal_notification_path(proposal_id: proposal.id) %> + <%= link_to t("users.proposals.send_message"), new_proposal_notification_path(proposal_id: proposal.id), + class: 'button hollow' %> <% end %> @@ -20,7 +21,7 @@ <% else %> <%= link_to t('users.proposals.retire'), retire_form_proposal_path(proposal), - class: 'delete' %> + class: 'button hollow alert' %> <% end %> <% end %> diff --git a/config/locales/en.yml b/config/locales/en.yml index 5a0dec0c6..4d5816f4c 100755 --- a/config/locales/en.yml +++ b/config/locales/en.yml @@ -351,10 +351,12 @@ en: one: 1 comment other: "%{count} comments" zero: No comments + comments_tab: Comments comments_title: Comments edit_proposal_link: Edit flag: This proposal has been flagged as inappropriate by several users. login_to_comment: You must %{signin} or %{signup} to leave a comment. + notifications_tab: Notifications retired_warning: "The author considers this proposal should not receive more supports." retired_warning_link_to_explanation: Read the explanation before voting for it. retired: Proposal retired by the author diff --git a/config/locales/es.yml b/config/locales/es.yml index 909e20bbc..36b318cc7 100755 --- a/config/locales/es.yml +++ b/config/locales/es.yml @@ -351,10 +351,12 @@ es: one: 1 Comentario other: "%{count} Comentarios" zero: Sin comentarios + comments_tab: Comentarios comments_title: Comentarios edit_proposal_link: Editar propuesta flag: Esta propuesta ha sido marcada como inapropiada por varios usuarios. login_to_comment: Necesitas %{signin} o %{signup} para comentar. + notifications_tab: Notificaciones retired_warning: "El autor de esta propuesta considera que ya no debe seguir recogiendo apoyos." retired_warning_link_to_explanation: Revisa su explicación antes de apoyarla. retired: Propuesta retirada por el autor From 14f17983f4363efb2b0976d88f1da7ac57863018 Mon Sep 17 00:00:00 2001 From: Alberto Garcia Cabeza Date: Mon, 6 Jun 2016 17:30:31 +0200 Subject: [PATCH 010/126] Improves styles for about receivers message --- app/views/proposal_notifications/new.html.erb | 14 ++++++++------ config/locales/en.yml | 2 +- config/locales/es.yml | 2 +- 3 files changed, 10 insertions(+), 8 deletions(-) diff --git a/app/views/proposal_notifications/new.html.erb b/app/views/proposal_notifications/new.html.erb index f8be10c2e..a5f829ecc 100644 --- a/app/views/proposal_notifications/new.html.erb +++ b/app/views/proposal_notifications/new.html.erb @@ -4,13 +4,15 @@

<%= t("proposal_notifications.new.title") %>

-

- <%= t("proposal_notifications.new.info_about_receivers", - count: @proposal.voters.count) %> +

+

+ <%= t("proposal_notifications.new.info_about_receivers_html", + count: @proposal.voters.count) %> - <%= link_to t("proposal_notifications.new.proposal_page"), - proposal_path(@proposal) %> -

+ <%= link_to t("proposal_notifications.new.proposal_page"), + proposal_path(@proposal) %> +

+
<%= form_for @notification do |f| %> <%= render "shared/errors", resource: @notification %> diff --git a/config/locales/en.yml b/config/locales/en.yml index 059cf5cd6..8905e0f00 100755 --- a/config/locales/en.yml +++ b/config/locales/en.yml @@ -370,7 +370,7 @@ en: title_label: "Title" body_label: "Message" submit_button: "Send message" - info_about_receivers: "This message will be send to %{count} people and it will be visible in " + info_about_receivers_html: "This message will be send to %{count} people and it will be visible in " proposal_page: "the proposal's page" show: back: "Go back to my activity" diff --git a/config/locales/es.yml b/config/locales/es.yml index 150c42583..24da77968 100755 --- a/config/locales/es.yml +++ b/config/locales/es.yml @@ -370,7 +370,7 @@ es: title_label: "Título" body_label: "Mensaje" submit_button: "Enviar mensaje" - info_about_receivers: "Este mensaje se enviará a %{count} usuarios y se publicará en " + info_about_receivers_html: "Este mensaje se enviará a %{count} usuarios y se publicará en " proposal_page: "la página de la propuesta" show: back: "Volver a mi actividad" From 224c9d42c49418401cfc92ea5b4a9eb7de0b36c3 Mon Sep 17 00:00:00 2001 From: Alberto Garcia Cabeza Date: Mon, 6 Jun 2016 17:47:17 +0200 Subject: [PATCH 011/126] Fixes layout for order comments --- app/assets/stylesheets/layout.scss | 1 + 1 file changed, 1 insertion(+) diff --git a/app/assets/stylesheets/layout.scss b/app/assets/stylesheets/layout.scss index ea426cf45..fdf7ff6c1 100644 --- a/app/assets/stylesheets/layout.scss +++ b/app/assets/stylesheets/layout.scss @@ -229,6 +229,7 @@ a { right: 0; top: 0; }; + margin-bottom: $line-height; .tabs-title > a { color: $text-medium; From bfc9c6c0dff9507ad686bc52ee94485350039db6 Mon Sep 17 00:00:00 2001 From: Alberto Garcia Cabeza Date: Mon, 6 Jun 2016 17:51:16 +0200 Subject: [PATCH 012/126] Improves styles for proposal show --- app/assets/stylesheets/layout.scss | 2 +- app/views/proposals/show.html.erb | 3 +-- 2 files changed, 2 insertions(+), 3 deletions(-) diff --git a/app/assets/stylesheets/layout.scss b/app/assets/stylesheets/layout.scss index fdf7ff6c1..209bcc3c6 100644 --- a/app/assets/stylesheets/layout.scss +++ b/app/assets/stylesheets/layout.scss @@ -1513,7 +1513,7 @@ table { .comment-votes { color: $text-medium; - font-size: $small-font-size; + font-size: rem-calc(14); line-height: $line-height; a { diff --git a/app/views/proposals/show.html.erb b/app/views/proposals/show.html.erb index 2a6ae7185..8a391a031 100644 --- a/app/views/proposals/show.html.erb +++ b/app/views/proposals/show.html.erb @@ -13,8 +13,7 @@ <%= render "shared/back_link" %> <% if current_user && @proposal.editable_by?(current_user) %> - <%= link_to edit_proposal_path(@proposal), class: 'edit-proposal button success small float-right' do %> - + <%= link_to edit_proposal_path(@proposal), class: 'edit-proposal button hollow float-right' do %> <%= t("proposals.show.edit_proposal_link") %> <% end %> <% end %> From 0a5369c7b4d57dc3c54a8025b7405f911b538c9c Mon Sep 17 00:00:00 2001 From: Alberto Garcia Cabeza Date: Mon, 6 Jun 2016 18:04:58 +0200 Subject: [PATCH 013/126] Shows anonymous messages on focus whit tab --- app/assets/javascripts/votes.js.coffee | 30 ++++++++++++++------------ 1 file changed, 16 insertions(+), 14 deletions(-) diff --git a/app/assets/javascripts/votes.js.coffee b/app/assets/javascripts/votes.js.coffee index e4223c644..030b9cf46 100644 --- a/app/assets/javascripts/votes.js.coffee +++ b/app/assets/javascripts/votes.js.coffee @@ -1,20 +1,22 @@ App.Votes = hoverize: (votes) -> - $(votes).hover -> - $("div.anonymous-votes", votes).show(); - $("div.organizations-votes", votes).show(); - $("div.not-logged", votes).show(); - $("div.no-supports-allowed", votes).show(); - $("div.logged", votes).hide(); - , -> - $("div.anonymous-votes", votes).hide(); - $("div.organizations-votes", votes).hide(); - $("div.not-logged", votes).hide(); - $("div.no-supports-allowed", votes).hide(); - $("div.logged", votes).show(); + $(document).on { + 'mouseenter focus': -> + $("div.anonymous-votes", this).show(); + $("div.organizations-votes", this).show(); + $("div.not-logged", this).show(); + $("div.no-supports-allowed", this).show(); + $("div.logged", this).hide(); + mouseleave: -> + $("div.anonymous-votes", this).hide(); + $("div.organizations-votes", this).hide(); + $("div.not-logged", this).hide(); + $("div.no-supports-allowed", this).hide(); + $("div.logged", this).show(); + }, votes initialize: -> - App.Votes.hoverize votes for votes in $("div.votes") - App.Votes.hoverize votes for votes in $("div.supports") + App.Votes.hoverize "div.votes" + App.Votes.hoverize "div.supports" false From 8e12fbdd557eaf1c1aa43943a13f61aa1fe9ad2f Mon Sep 17 00:00:00 2001 From: rgarcia Date: Tue, 7 Jun 2016 13:48:09 +0200 Subject: [PATCH 014/126] adds time limit between notifications --- app/models/proposal_notification.rb | 9 ++++++ config/locales/activerecord.en.yml | 3 ++ config/locales/activerecord.es.yml | 3 ++ db/seeds.rb | 3 ++ spec/features/proposal_notifications_spec.rb | 10 ++++++ spec/models/proposal_notification_spec.rb | 34 ++++++++++++++++++++ 6 files changed, 62 insertions(+) diff --git a/app/models/proposal_notification.rb b/app/models/proposal_notification.rb index d31b2e1a5..11bfea8ae 100644 --- a/app/models/proposal_notification.rb +++ b/app/models/proposal_notification.rb @@ -5,4 +5,13 @@ class ProposalNotification < ActiveRecord::Base validates :title, presence: true validates :body, presence: true validates :proposal, presence: true + validate :minimum_interval + + def minimum_interval + return true if proposal.notifications.blank? + if proposal.notifications.last.created_at > (Time.now - Setting[:proposal_notification_minimum_interval_in_days].to_i.days).to_datetime + errors.add(:minimum_interval, I18n.t('activerecord.errors.models.proposal_notification.minimum_interval', interval: Setting[:proposal_notification_minimum_interval])) + end + end + end \ No newline at end of file diff --git a/config/locales/activerecord.en.yml b/config/locales/activerecord.en.yml index 91c035dfb..1d46596c2 100644 --- a/config/locales/activerecord.en.yml +++ b/config/locales/activerecord.en.yml @@ -84,3 +84,6 @@ en: attributes: tag_list: less_than_or_equal_to: "tags must be less than or equal to %{count}" + proposal_notification: + attributes: + minimum_interval: "You have to wait a minium of %{interval} days between notifications" \ No newline at end of file diff --git a/config/locales/activerecord.es.yml b/config/locales/activerecord.es.yml index a7644f02e..001be7228 100644 --- a/config/locales/activerecord.es.yml +++ b/config/locales/activerecord.es.yml @@ -84,3 +84,6 @@ es: attributes: tag_list: less_than_or_equal_to: "los temas deben ser menor o igual que %{count}" + proposal_notification: + attributes: + minimum_interval: "Debes esperar un mínimo de %{interval} días entre notificaciones" \ No newline at end of file diff --git a/db/seeds.rb b/db/seeds.rb index 7555f6999..5a6db1574 100644 --- a/db/seeds.rb +++ b/db/seeds.rb @@ -74,3 +74,6 @@ Setting['banner-style.banner-style-three'] = "Banner style 3" 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" + +# Proposal notifications +Setting['proposal_notification_minimum_interval_in_days '] = 3 diff --git a/spec/features/proposal_notifications_spec.rb b/spec/features/proposal_notifications_spec.rb index f40e0b81e..87a717ba2 100644 --- a/spec/features/proposal_notifications_spec.rb +++ b/spec/features/proposal_notifications_spec.rb @@ -84,4 +84,14 @@ feature 'Proposal Notifications' do expect(page).to have_content error_message end + context "Limits" do + + pending "Cannot send more than one notification within established interval" do + end + + pending "use timecop to make sure notifications can be sent after time interval" do + end + + end + end \ No newline at end of file diff --git a/spec/models/proposal_notification_spec.rb b/spec/models/proposal_notification_spec.rb index 5a7575219..f66b254b6 100644 --- a/spec/models/proposal_notification_spec.rb +++ b/spec/models/proposal_notification_spec.rb @@ -22,4 +22,38 @@ describe ProposalNotification do expect(notification).to_not be_valid end + describe "minimum interval between notifications" do + + before(:each) do + Setting[:proposal_notification_minimum_interval_in_days] = 3 + end + + it "should not be valid if below minium interval" do + proposal = create(:proposal) + + notification1 = create(:proposal_notification, proposal: proposal) + notification2 = build(:proposal_notification, proposal: proposal) + + proposal.reload + expect(notification2).to_not be_valid + end + + it "should be valid if notifications above minium interval" do + proposal = create(:proposal) + + notification1 = create(:proposal_notification, proposal: proposal, created_at: 4.days.ago) + notification2 = build(:proposal_notification, proposal: proposal) + + proposal.reload + expect(notification2).to be_valid + end + + it "should be valid if no notifications sent" do + notification1 = build(:proposal_notification) + + expect(notification1).to be_valid + end + + end + end From 43251585b99398ca38fe962f7a64e3271b23e591 Mon Sep 17 00:00:00 2001 From: rgarcia Date: Tue, 7 Jun 2016 13:56:40 +0200 Subject: [PATCH 015/126] pending permissions spec --- spec/models/abilities/everyone_spec.rb | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/spec/models/abilities/everyone_spec.rb b/spec/models/abilities/everyone_spec.rb index 3f1e57278..30ce5c3a6 100644 --- a/spec/models/abilities/everyone_spec.rb +++ b/spec/models/abilities/everyone_spec.rb @@ -26,4 +26,6 @@ describe "Abilities::Everyone" do it { should be_able_to(:index, SpendingProposal) } it { should_not be_able_to(:create, SpendingProposal) } -end + + pending "only authors can access new and create for ProposalNotifications" +end \ No newline at end of file From e550a40f90ad4a1d774a3d06e67ca5300f36e7d4 Mon Sep 17 00:00:00 2001 From: Alberto Garcia Cabeza Date: Tue, 7 Jun 2016 16:12:16 +0200 Subject: [PATCH 016/126] Adds share and comment button on email --- app/assets/images/icon_mailer_comment.png | Bin 0 -> 251 bytes app/assets/images/icon_mailer_share.png | Bin 0 -> 379 bytes app/mailers/mailer.rb | 2 +- .../mailer/proposal_notification.html.erb | 22 +++++++++++++++++- app/views/proposals/show.html.erb | 2 +- config/locales/mailers.en.yml | 5 +++- config/locales/mailers.es.yml | 3 +++ 7 files changed, 30 insertions(+), 4 deletions(-) create mode 100644 app/assets/images/icon_mailer_comment.png create mode 100644 app/assets/images/icon_mailer_share.png diff --git a/app/assets/images/icon_mailer_comment.png b/app/assets/images/icon_mailer_comment.png new file mode 100644 index 0000000000000000000000000000000000000000..d3c9bff738825499e7c06f8a2adce4b5d17b586c GIT binary patch literal 251 zcmeAS@N?(olHy`uVBq!ia0vp^0wB!61|;P_|4#%`EX7WqAsj$Z!;#Vf4nJ za0`PlBg3pY5@fx({`eF=FuU@JE6u`H t^}0y%m%?NFP723uJSgy8?a}=M%yHKgpUwZrxEbhB22WQ%mvv4FO#oa~T$ca< literal 0 HcmV?d00001 diff --git a/app/assets/images/icon_mailer_share.png b/app/assets/images/icon_mailer_share.png new file mode 100644 index 0000000000000000000000000000000000000000..f95d44141b621be582501edd89e8cbdf98321ba1 GIT binary patch literal 379 zcmeAS@N?(olHy`uVBq!ia0vp^0wB!61|;P_|4#%`EX7WqAsj$Z!;#Vf4nJ za0`PlBg3pY5)2HCvYsxEAr`$yCv5a$P84WK|9|9!JjegHc^wIgON8HiRn572%&hl^ z%(f&|j%i9^N)gdrD^>Uv#FWhL9c6yVHF-@d%U7HJIlaN>jPAel;}um^ntrc(e(FtK zhAXR>q}E>RHMahCkAJg{bO=+4)m+vdx6^K4TwH#CKKm@Twk^ijW!u@Daud1ovpEcl zL>h|IUW=^!Cc9x4x2;Oy9ucP(lZw+>_6S{!o1_xX5VNGpt3mqMM=_VHUDu30dmZ^B zvGQHbSJx*UGxZtH)Jm{62rzZOvNg_smaepkZNbM(5eAnh6GHh8iTgg{%I_2h3;qYyYi)m*Ktk X)PU#K>!xG?Lyy7J)z4*}Q$iB}&@_=P literal 0 HcmV?d00001 diff --git a/app/mailers/mailer.rb b/app/mailers/mailer.rb index b8ca433ce..447daabc4 100644 --- a/app/mailers/mailer.rb +++ b/app/mailers/mailer.rb @@ -46,7 +46,7 @@ class Mailer < ApplicationMailer @notification = notification with_user(voter) do - mail(to: voter.email, subject: @notification.title) + mail(to: voter.email, subject: @notification.title + ": " + @notification.proposal.title) end end diff --git a/app/views/mailer/proposal_notification.html.erb b/app/views/mailer/proposal_notification.html.erb index 59489840c..3bcfccc1b 100644 --- a/app/views/mailer/proposal_notification.html.erb +++ b/app/views/mailer/proposal_notification.html.erb @@ -4,6 +4,26 @@

- <%= @notification.body %> + <%= @notification.body %>

+ + + + + + + + + +
+ <%= link_to "#comments", style: "font-family: 'Open Sans','Helvetica Neue',arial,sans-serif; background: #f7f5f2; border-radius: 6px; color: #3d3d66!important; font-weight: bold; margin: 0px; padding: 10px 15px; text-align: center; text-decoration: none; min-width: 200px; display: inline-block;" do %> + <%= image_tag('icon_mailer_share.png', style: "border: 0; display: inline-block; width: 100%; max-width: 16px", alt: "") %> + <%= t('mailers.proposal_notification.share') %> + <% end %> + + <%= link_to "#social-share", style: "font-family: 'Open Sans','Helvetica Neue',arial,sans-serif; background: #f7f5f2; border-radius: 6px; color: #3d3d66!important; font-weight: bold; margin: 0px; padding: 10px 15px; text-align: center; text-decoration: none; min-width: 200px; display: inline-block;" do %> + <%= image_tag('icon_mailer_comment.png', style: "border: 0; display: inline-block; width: 100%; max-width: 16px; vertical-align: middle;", alt: "") %> + <%= t('mailers.proposal_notification.comment') %> + <% end %> +
diff --git a/app/views/proposals/show.html.erb b/app/views/proposals/show.html.erb index 8a391a031..2153b23e5 100644 --- a/app/views/proposals/show.html.erb +++ b/app/views/proposals/show.html.erb @@ -103,7 +103,7 @@ { proposal: @proposal, vote_url: vote_proposal_path(@proposal, value: 'yes') } %> -
+

<%= t("proposals.show.share") %>

From 29f869046a22598bfb0a03fc158bd61a28d21628 Mon Sep 17 00:00:00 2001 From: Alberto Garcia Cabeza Date: Fri, 10 Jun 2016 18:01:59 +0200 Subject: [PATCH 030/126] Adds message for no accepting private messages --- app/views/users/show.html.erb | 6 +++++- config/locales/en.yml | 1 + config/locales/es.yml | 1 + 3 files changed, 7 insertions(+), 1 deletion(-) diff --git a/app/views/users/show.html.erb b/app/views/users/show.html.erb index 6adb97b37..31c62d13c 100644 --- a/app/views/users/show.html.erb +++ b/app/views/users/show.html.erb @@ -2,10 +2,14 @@
- <% if @user != current_user %> + <% if @user != current_user %> <%= link_to t("users.show.send_private_message"), new_user_direct_message_path(@user), class: "button hollow float-right" %> + +
+ <%= t("users.show.no_private_messages") %> +
<% end %>

diff --git a/config/locales/en.yml b/config/locales/en.yml index 40403561e..c0a68815b 100755 --- a/config/locales/en.yml +++ b/config/locales/en.yml @@ -530,6 +530,7 @@ en: one: 1 Spending proposal other: "%{count} Spending proposals" no_activity: User has no public activity + no_private_messages: "This user doesn't accept private messages." private_activity: This user decided to keep the activity list private send_private_message: "Send private message" proposals: diff --git a/config/locales/es.yml b/config/locales/es.yml index 397eca876..2354e4742 100755 --- a/config/locales/es.yml +++ b/config/locales/es.yml @@ -530,6 +530,7 @@ es: one: 1 Propuesta de inversión other: "%{count} Propuestas de inversión" no_activity: Usuario sin actividad pública + no_private_messages: "Este usuario no acepta mensajes privados." private_activity: Este usuario ha decidido mantener en privado su lista de actividades send_private_message: "Enviar un mensaje privado" proposals: From 988f1f645a27eb0939351c2e9ee48d161c1e03fa Mon Sep 17 00:00:00 2001 From: Alberto Garcia Cabeza Date: Fri, 10 Jun 2016 18:02:37 +0200 Subject: [PATCH 031/126] Improves proposal notification mailer and fixes settings.scss --- app/assets/stylesheets/_settings.scss | 2 +- app/views/mailer/proposal_notification.html.erb | 6 +++--- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/app/assets/stylesheets/_settings.scss b/app/assets/stylesheets/_settings.scss index 1e181e1c1..57a1afb7c 100644 --- a/app/assets/stylesheets/_settings.scss +++ b/app/assets/stylesheets/_settings.scss @@ -192,7 +192,7 @@ $header-color: inherit; $header-lineheight: 1.4; $header-margin-bottom: 0.5rem; $header-text-rendering: optimizeLegibility; -$small-font-size: 80%; +$small-font-size: rem-calc(14); $header-small-font-color: $medium-gray; $paragraph-lineheight: 1.6; $paragraph-margin-bottom: 1rem; diff --git a/app/views/mailer/proposal_notification.html.erb b/app/views/mailer/proposal_notification.html.erb index 3bcfccc1b..04ca39d86 100644 --- a/app/views/mailer/proposal_notification.html.erb +++ b/app/views/mailer/proposal_notification.html.erb @@ -7,18 +7,18 @@ <%= @notification.body %>

- +
diff --git a/config/locales/mailers.en.yml b/config/locales/mailers.en.yml index c90ca12c9..66c1c75ea 100755 --- a/config/locales/mailers.en.yml +++ b/config/locales/mailers.en.yml @@ -33,5 +33,9 @@ en: proposal_notification: share: Share comment: Comment proposal + proposal_notification_digest: + title: You received the following notifications + share: Share + comment: Comment proposal direct_message: reply: Reply to %{sender} \ No newline at end of file diff --git a/config/locales/mailers.es.yml b/config/locales/mailers.es.yml index 75ff487d1..36343267d 100644 --- a/config/locales/mailers.es.yml +++ b/config/locales/mailers.es.yml @@ -33,5 +33,9 @@ es: proposal_notification: share: Compartir comment: Comentar propuesta + proposal_notification_digest: + title: Has recibido las siguientes notificaciones + share: Compartir + comment: Comentar propuesta direct_message: reply: Responder a %{sender} \ No newline at end of file From 143089603cb26250a57be78850fb45880f639d81 Mon Sep 17 00:00:00 2001 From: rgarcia Date: Mon, 13 Jun 2016 12:33:46 +0200 Subject: [PATCH 033/126] fixes specs --- app/views/mailer/direct_message.html.erb | 2 +- spec/factories.rb | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/app/views/mailer/direct_message.html.erb b/app/views/mailer/direct_message.html.erb index c974a7644..28235089b 100644 --- a/app/views/mailer/direct_message.html.erb +++ b/app/views/mailer/direct_message.html.erb @@ -11,7 +11,7 @@
- <%= link_to "#comments", style: "font-family: 'Open Sans','Helvetica Neue',arial,sans-serif; background: #f7f5f2; border-radius: 6px; color: #3d3d66!important; font-weight: bold; margin: 0px; padding: 10px 15px; text-align: center; text-decoration: none; min-width: 200px; display: inline-block;" do %> + <%= link_to "#comments", style: "font-family: 'Open Sans','Helvetica Neue',arial,sans-serif; background: #f7f5f2; border-radius: 6px; color: #3d3d66!important; font-weight: bold; margin: 0px; padding: 10px 15px; text-align: center; text-decoration: none; min-width: 160px; display: inline-block;" do %> <%= image_tag('icon_mailer_share.png', style: "border: 0; display: inline-block; width: 100%; max-width: 16px", alt: "") %> <%= t('mailers.proposal_notification.share') %> <% end %> - <%= link_to "#social-share", style: "font-family: 'Open Sans','Helvetica Neue',arial,sans-serif; background: #f7f5f2; border-radius: 6px; color: #3d3d66!important; font-weight: bold; margin: 0px; padding: 10px 15px; text-align: center; text-decoration: none; min-width: 200px; display: inline-block;" do %> + <%= link_to "#social-share", style: "font-family: 'Open Sans','Helvetica Neue',arial,sans-serif; background: #f7f5f2; border-radius: 6px; color: #3d3d66!important; font-weight: bold; margin: 0px; padding: 10px 15px; text-align: center; text-decoration: none; min-width: 160px; display: inline-block;" do %> <%= image_tag('icon_mailer_comment.png', style: "border: 0; display: inline-block; width: 100%; max-width: 16px; vertical-align: middle;", alt: "") %> <%= t('mailers.proposal_notification.comment') %> <% end %> From a417d88f9113219fd491121ea06d56a059613db3 Mon Sep 17 00:00:00 2001 From: Alberto Garcia Cabeza Date: Fri, 10 Jun 2016 18:03:03 +0200 Subject: [PATCH 032/126] Adds proposal notification digest mailer --- .../proposal_notification_digest.html.erb | 51 +++++++++++++++++++ config/locales/mailers.en.yml | 4 ++ config/locales/mailers.es.yml | 4 ++ 3 files changed, 59 insertions(+) create mode 100644 app/views/mailer/proposal_notification_digest.html.erb diff --git a/app/views/mailer/proposal_notification_digest.html.erb b/app/views/mailer/proposal_notification_digest.html.erb new file mode 100644 index 000000000..4733d900e --- /dev/null +++ b/app/views/mailer/proposal_notification_digest.html.erb @@ -0,0 +1,51 @@ + + + + + + + +
+

+ <%= t('mailers.proposal_notification_digest.title') %> +

+
+ + + + + + + + +
+

+ <%= @notification.title %> +

+

+ <%= @notification.proposal.title %> • <%= @notification.proposal.created_at.to_date %> • <%= @notification.proposal.author.name %> +

+

+ <%= @notification.body %> +

+ + + + + + + +
+ <%= link_to "#comments", style: "font-family: 'Open Sans','Helvetica Neue',arial,sans-serif; background: #f7f5f2; border-radius: 6px; color: #3d3d66!important; font-weight: bold; margin: 0px; padding: 10px 15px; text-align: center; text-decoration: none; min-width: 160px; display: inline-block;" do %> + <%= image_tag('icon_mailer_share.png', style: "border: 0; display: inline-block; width: 100%; max-width: 16px", alt: "") %> + <%= t('mailers.proposal_notification_digest.share') %> + <% end %> + + <%= link_to "#social-share", style: "font-family: 'Open Sans','Helvetica Neue',arial,sans-serif; background: #f7f5f2; border-radius: 6px; color: #3d3d66!important; font-weight: bold; margin: 0px; padding: 10px 15px; text-align: center; text-decoration: none; min-width: 160px; display: inline-block; margin-left: 12px;" do %> + <%= image_tag('icon_mailer_comment.png', style: "border: 0; display: inline-block; width: 100%; max-width: 16px; vertical-align: middle;", alt: "") %> + <%= t('mailers.proposal_notification_digest.comment') %> + <% end %> +
+
+ +
- <%= link_to user_path(@direct_message.sender_id), style: "font-family: 'Open Sans','Helvetica Neue',arial,sans-serif; background: #f7f5f2; border-radius: 6px; color: #3d3d66!important; font-weight: bold; margin: 0px; padding: 10px 15px; text-align: center; text-decoration: none; min-width: 200px; display: inline-block;", target: "_blank" do %> + <%= link_to user_url(@direct_message.sender_id), style: "font-family: 'Open Sans','Helvetica Neue',arial,sans-serif; background: #f7f5f2; border-radius: 6px; color: #3d3d66!important; font-weight: bold; margin: 0px; padding: 10px 15px; text-align: center; text-decoration: none; min-width: 200px; display: inline-block;", target: "_blank" do %> <%= image_tag('icon_mailer_reply.png', style: "border: 0; display: inline-block; width: 100%; max-width: 12px; vertical-align: sub;", alt: "") %> <%= t('mailers.direct_message.reply', sender: @direct_message.sender.name) %> diff --git a/spec/factories.rb b/spec/factories.rb index f642abaf1..ef9c56c47 100644 --- a/spec/factories.rb +++ b/spec/factories.rb @@ -333,7 +333,7 @@ FactoryGirl.define do end factory :direct_message do - title "Hey!" + title "Hey" body "How are You doing?" association :sender, factory: :user association :receiver, factory: :user From 9b1be8da19f3978d376b39098204e6d9a7a2607b Mon Sep 17 00:00:00 2001 From: rgarcia Date: Mon, 13 Jun 2016 12:33:59 +0200 Subject: [PATCH 034/126] adds direct message specs --- spec/features/direct_messages_spec.rb | 71 +++++++++++++++++++++++++++ 1 file changed, 71 insertions(+) create mode 100644 spec/features/direct_messages_spec.rb diff --git a/spec/features/direct_messages_spec.rb b/spec/features/direct_messages_spec.rb new file mode 100644 index 000000000..d9301a29e --- /dev/null +++ b/spec/features/direct_messages_spec.rb @@ -0,0 +1,71 @@ +require 'rails_helper' + +feature 'Direct messages' do + + scenario "Create", :focus do + sender = create(:user, :level_two) + receiver = create(:user, :level_two) + + login_as(sender) + visit user_path(receiver) + + click_link "Send private message" + + expect(page).to have_content "Send private message to #{receiver.name}" + + fill_in 'direct_message_title', with: "Hey!" + fill_in 'direct_message_body', with: "How are you doing?" + click_button "Send message" + + expect(page).to have_content "You message has been sent successfully." + expect(page).to have_content "Hey!" + expect(page).to have_content "How are you doing?" + end + + context "Permissions" do + + scenario "Link to send the message" do + sender = create(:user, :level_two) + + login_as(sender) + visit user_path(sender) + + expect(page).to_not have_link "Send private message" + end + + scenario "Accessing form directly" do + user = create(:user) + author = create(:user) + proposal = create(:proposal, author: author) + + login_as(user) + visit new_proposal_notification_path(proposal_id: proposal.id) + + expect(current_path).to eq(proposals_path) + expect(page).to have_content("You do not have permission to carry out the action") + end + + pending "unverified user" + + end + + scenario "Error messages" do + author = create(:user) + proposal = create(:proposal, author: author) + + login_as(author) + + visit new_proposal_notification_path(proposal_id: proposal.id) + click_button "Send message" + + expect(page).to have_content error_message + end + + context "Limits" do + + pending "Cannot send more than one notification within established interval" + pending "use timecop to make sure notifications can be sent after time interval" + + end + +end \ No newline at end of file From 6e800c512050c6eb576bec65aca96abf39ff3c64 Mon Sep 17 00:00:00 2001 From: rgarcia Date: Tue, 14 Jun 2016 17:53:36 +0200 Subject: [PATCH 035/126] adds email digest for proposal notifications --- app/mailers/mailer.rb | 8 +++ app/models/user.rb | 1 + .../proposal_notification_digest.html.erb | 72 ++++++++++--------- ...0160613150659_add_email_digest_to_users.rb | 5 ++ db/schema.rb | 3 +- lib/email_digest.rb | 14 ++++ lib/tasks/emails.rake | 9 +++ spec/factories.rb | 2 +- spec/features/direct_messages_spec.rb | 2 +- spec/features/emails_spec.rb | 47 ++++++++++++ spec/features/proposal_notifications_spec.rb | 47 ++++++++++++ spec/lib/email_digests_spec.rb | 9 +++ spec/support/common_actions.rb | 18 +++++ 13 files changed, 199 insertions(+), 38 deletions(-) create mode 100644 db/migrate/20160613150659_add_email_digest_to_users.rb create mode 100644 lib/email_digest.rb create mode 100644 lib/tasks/emails.rake create mode 100644 spec/lib/email_digests_spec.rb diff --git a/app/mailers/mailer.rb b/app/mailers/mailer.rb index 2a81c4bfe..d900fd17d 100644 --- a/app/mailers/mailer.rb +++ b/app/mailers/mailer.rb @@ -59,6 +59,14 @@ class Mailer < ApplicationMailer end end + def proposal_notification_digest(user) + @notifications = user.notifications.where(notifiable_type: "ProposalNotification") + + with_user(user) do + mail(to: user.email, subject: "Email digest") + end + end + private def with_user(user, &block) diff --git a/app/models/user.rb b/app/models/user.rb index 243781cb3..a3b719859 100644 --- a/app/models/user.rb +++ b/app/models/user.rb @@ -51,6 +51,7 @@ class User < ActiveRecord::Base scope :officials, -> { where("official_level > 0") } scope :for_render, -> { includes(:organization) } scope :by_document, -> (document_type, document_number) { where(document_type: document_type, document_number: document_number) } + scope :email_digest, -> { where(email_digest: true) } before_validation :clean_document_number diff --git a/app/views/mailer/proposal_notification_digest.html.erb b/app/views/mailer/proposal_notification_digest.html.erb index 4733d900e..16e96260c 100644 --- a/app/views/mailer/proposal_notification_digest.html.erb +++ b/app/views/mailer/proposal_notification_digest.html.erb @@ -11,41 +11,43 @@
- - - - - + + +
-

- <%= @notification.title %> -

-

- <%= @notification.proposal.title %> • <%= @notification.proposal.created_at.to_date %> • <%= @notification.proposal.author.name %> -

-

- <%= @notification.body %> -

+ <%= @notifications.each do |notification| %> + + + + + + +
+

+ <%= link_to notification.notifiable.title, notification_url(notification) %> +

+

+ <%= notification.notifiable.proposal.title %> •  + <%= notification.notifiable.proposal.created_at.to_date %> •  + <%= notification.notifiable.proposal.author.name %> +

+

+ <%= notification.notifiable.body %> +

- - - - - - -
- <%= link_to "#comments", style: "font-family: 'Open Sans','Helvetica Neue',arial,sans-serif; background: #f7f5f2; border-radius: 6px; color: #3d3d66!important; font-weight: bold; margin: 0px; padding: 10px 15px; text-align: center; text-decoration: none; min-width: 160px; display: inline-block;" do %> - <%= image_tag('icon_mailer_share.png', style: "border: 0; display: inline-block; width: 100%; max-width: 16px", alt: "") %> - <%= t('mailers.proposal_notification_digest.share') %> - <% end %> + + + + - - -
+ <%= link_to proposal_url(notification.notifiable.proposal, anchor: "comments"), style: "font-family: 'Open Sans','Helvetica Neue',arial,sans-serif; background: #f7f5f2; border-radius: 6px; color: #3d3d66!important; font-weight: bold; margin: 0px; padding: 10px 15px; text-align: center; text-decoration: none; min-width: 160px; display: inline-block;" do %> + <%= image_tag('icon_mailer_share.png', style: "border: 0; display: inline-block; width: 100%; max-width: 16px", alt: "") %> + <%= t('mailers.proposal_notification_digest.share') %> + <% end %> - <%= link_to "#social-share", style: "font-family: 'Open Sans','Helvetica Neue',arial,sans-serif; background: #f7f5f2; border-radius: 6px; color: #3d3d66!important; font-weight: bold; margin: 0px; padding: 10px 15px; text-align: center; text-decoration: none; min-width: 160px; display: inline-block; margin-left: 12px;" do %> - <%= image_tag('icon_mailer_comment.png', style: "border: 0; display: inline-block; width: 100%; max-width: 16px; vertical-align: middle;", alt: "") %> - <%= t('mailers.proposal_notification_digest.comment') %> - <% end %> -
-
- + <%= link_to proposal_url(notification.notifiable.proposal, anchor: "social-share"), style: "font-family: 'Open Sans','Helvetica Neue',arial,sans-serif; background: #f7f5f2; border-radius: 6px; color: #3d3d66!important; font-weight: bold; margin: 0px; padding: 10px 15px; text-align: center; text-decoration: none; min-width: 160px; display: inline-block; margin-left: 12px;" do %> + <%= image_tag('icon_mailer_comment.png', style: "border: 0; display: inline-block; width: 100%; max-width: 16px; vertical-align: middle;", alt: "") %> + <%= t('mailers.proposal_notification_digest.comment') %> + <% end %> +
+
+ <% end %> diff --git a/db/migrate/20160613150659_add_email_digest_to_users.rb b/db/migrate/20160613150659_add_email_digest_to_users.rb new file mode 100644 index 000000000..d127af78e --- /dev/null +++ b/db/migrate/20160613150659_add_email_digest_to_users.rb @@ -0,0 +1,5 @@ +class AddEmailDigestToUsers < ActiveRecord::Migration + def change + add_column :users, :email_digest, :boolean, default: true + end +end diff --git a/db/schema.rb b/db/schema.rb index bbd6dda8f..c4fddf324 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: 20160608174104) do +ActiveRecord::Schema.define(version: 20160613150659) do # These are extensions that must be enabled in order to support this database enable_extension "plpgsql" @@ -460,6 +460,7 @@ ActiveRecord::Schema.define(version: 20160608174104) do t.string "gender", limit: 10 t.datetime "date_of_birth" t.boolean "email_on_proposal_notification", default: true + t.boolean "email_digest", default: true end add_index "users", ["confirmation_token"], name: "index_users_on_confirmation_token", unique: true, using: :btree diff --git a/lib/email_digest.rb b/lib/email_digest.rb new file mode 100644 index 000000000..90838f78f --- /dev/null +++ b/lib/email_digest.rb @@ -0,0 +1,14 @@ +class EmailDigest + + def initialize + end + + def create + User.email_digest.each do |user| + if user.notifications.where(notifiable_type: "ProposalNotification").any? + Mailer.proposal_notification_digest(user).deliver_later + end + end + end + +end \ No newline at end of file diff --git a/lib/tasks/emails.rake b/lib/tasks/emails.rake new file mode 100644 index 000000000..6670264a5 --- /dev/null +++ b/lib/tasks/emails.rake @@ -0,0 +1,9 @@ +namespace :emails do + + desc "Sends email digest of proposal notifications to each user" + task digest: :environment do + email_digest = EmailDigest.new + email_digest.create + end + +end diff --git a/spec/factories.rb b/spec/factories.rb index ef9c56c47..4ead8ecac 100644 --- a/spec/factories.rb +++ b/spec/factories.rb @@ -136,7 +136,7 @@ FactoryGirl.define do factory :proposal do sequence(:title) { |n| "Proposal #{n} title" } - summary 'In summary, what we want is...' + sequence(:summary) { |n| "In summary, what we want is... #{n}" } description 'Proposal description' question 'Proposal question' external_url 'http://external_documention.es' diff --git a/spec/features/direct_messages_spec.rb b/spec/features/direct_messages_spec.rb index d9301a29e..142be8cbb 100644 --- a/spec/features/direct_messages_spec.rb +++ b/spec/features/direct_messages_spec.rb @@ -2,7 +2,7 @@ require 'rails_helper' feature 'Direct messages' do - scenario "Create", :focus do + scenario "Create" do sender = create(:user, :level_two) receiver = create(:user, :level_two) diff --git a/spec/features/emails_spec.rb b/spec/features/emails_spec.rb index ec8ff7b5f..5894d40ed 100644 --- a/spec/features/emails_spec.rb +++ b/spec/features/emails_spec.rb @@ -204,4 +204,51 @@ feature 'Emails' do end end + context "Proposal notification digest" do + + scenario "notifications for proposals that I have supported" do + user = create(:user, email_digest: true) + + proposal1 = create(:proposal) + proposal2 = create(:proposal) + proposal3 = create(:proposal) + + create(:vote, votable: proposal1, voter: user) + create(:vote, votable: proposal2, voter: user) + + reset_mailer + + notification1 = create_proposal_notification(proposal1) + notification2 = create_proposal_notification(proposal2) + notification3 = create_proposal_notification(proposal3) + + email_digest = EmailDigest.new + email_digest.create + + email = open_last_email + expect(email).to have_subject("Email digest") + expect(email).to deliver_to(user.email) + + expect(email).to have_body_text(proposal1.title) + expect(email).to have_body_text(notification1.notifiable.title) + expect(email).to have_body_text(notification1.notifiable.body) + expect(email).to have_body_text(proposal1.author.name) + + expect(email).to have_body_text(/#{notification_path(notification1)}/) + expect(email).to have_body_text(/#{proposal_path(proposal1, anchor: 'comments')}/) + expect(email).to have_body_text(/#{proposal_path(proposal1, anchor: 'social-share')}/) + + expect(email).to have_body_text(proposal2.title) + expect(email).to have_body_text(notification2.notifiable.title) + expect(email).to have_body_text(notification2.notifiable.body) + expect(email).to have_body_text(/#{notification_path(notification2)}/) + expect(email).to have_body_text(/#{proposal_path(proposal2, anchor: 'comments')}/) + expect(email).to have_body_text(/#{proposal_path(proposal2, anchor: 'social-share')}/) + expect(email).to have_body_text(proposal2.author.name) + + expect(email).to_not have_body_text(proposal3.title) + end + + end + end diff --git a/spec/features/proposal_notifications_spec.rb b/spec/features/proposal_notifications_spec.rb index be8b146fd..7785a1236 100644 --- a/spec/features/proposal_notifications_spec.rb +++ b/spec/features/proposal_notifications_spec.rb @@ -51,6 +51,53 @@ feature 'Proposal Notifications' do expect(page).to have_link("the proposal's page", href: proposal_path(proposal)) end + context "Receivers" do + + scenario "Only send a digest to users that have the option set in their profile" do + user1 = create(:user, email_digest: true) + user2 = create(:user, email_digest: true) + user3 = create(:user, email_digest: false) + + proposal = create(:proposal) + + [user1, user2, user3].each do |user| + create(:vote, votable: proposal, voter: user) + end + + create_proposal_notification(proposal) + + reset_mailer + email_digest = EmailDigest.new + email_digest.create + + expect(unread_emails_for(user1.email).size).to eql parse_email_count(1) + expect(unread_emails_for(user2.email).size).to eql parse_email_count(1) + expect(unread_emails_for(user3.email).size).to eql parse_email_count(0) + end + + scenario "Only send a digest to users that have voted for a proposal" do + user1 = create(:user, email_digest: true) + user2 = create(:user, email_digest: true) + user3 = create(:user, email_digest: true) + + proposal = create(:proposal) + + [user1, user2].each do |user| + create(:vote, votable: proposal, voter: user) + end + + create_proposal_notification(proposal) + + reset_mailer + email_digest = EmailDigest.new + email_digest.create + + expect(unread_emails_for(user1.email).size).to eql parse_email_count(1) + expect(unread_emails_for(user2.email).size).to eql parse_email_count(1) + expect(unread_emails_for(user3.email).size).to eql parse_email_count(0) + end + + end context "Permissions" do scenario "Link to send the message" do diff --git a/spec/lib/email_digests_spec.rb b/spec/lib/email_digests_spec.rb new file mode 100644 index 000000000..6fc6eef53 --- /dev/null +++ b/spec/lib/email_digests_spec.rb @@ -0,0 +1,9 @@ +require 'rails_helper' + +describe EmailDigest do + + describe "create" do + pending "only send unread notifications" + end + +end \ No newline at end of file diff --git a/spec/support/common_actions.rb b/spec/support/common_actions.rb index 18a3f9499..39faf03f5 100644 --- a/spec/support/common_actions.rb +++ b/spec/support/common_actions.rb @@ -196,4 +196,22 @@ module CommonActions tag_cloud.tags.map(&:name) end + def create_proposal_notification(proposal) + login_as(proposal.author) + visit root_path + + click_link "My activity" + + within("#proposal_#{proposal.id}") do + click_link "Send message" + end + + fill_in 'proposal_notification_title', with: "Thank you for supporting my proposal #{proposal.title}" + fill_in 'proposal_notification_body', with: "Please share it with others so we can make it happen! #{proposal.summary}" + click_button "Send message" + + expect(page).to have_content "Your message has been sent correctly." + Notification.last + end + end From 9f19a5d1439085af9b2ab8cff64bb8d75d0130ca Mon Sep 17 00:00:00 2001 From: rgarcia Date: Tue, 14 Jun 2016 18:08:27 +0200 Subject: [PATCH 036/126] adds option to receive email digest --- app/controllers/account_controller.rb | 2 +- app/views/account/show.html.erb | 9 +++++++++ config/locales/en.yml | 1 + config/locales/es.yml | 1 + spec/features/account_spec.rb | 3 ++- spec/models/user_spec.rb | 6 ++++++ 6 files changed, 20 insertions(+), 2 deletions(-) diff --git a/app/controllers/account_controller.rb b/app/controllers/account_controller.rb index d1ac9c9c4..8bcb5f4d0 100644 --- a/app/controllers/account_controller.rb +++ b/app/controllers/account_controller.rb @@ -25,7 +25,7 @@ class AccountController < ApplicationController if @account.organization? params.require(:account).permit(:phone_number, :email_on_comment, :email_on_comment_reply, :newsletter, organization_attributes: [:name, :responsible_name]) else - params.require(:account).permit(:username, :public_activity, :email_on_comment, :email_on_comment_reply, :email_on_proposal_notification, :newsletter) + params.require(:account).permit(:username, :public_activity, :email_on_comment, :email_on_comment_reply, :email_on_proposal_notification, :email_digest, :newsletter) end end diff --git a/app/views/account/show.html.erb b/app/views/account/show.html.erb index b3a84dede..2180ce5f9 100644 --- a/app/views/account/show.html.erb +++ b/app/views/account/show.html.erb @@ -78,6 +78,15 @@ <% end %>

+
+ <%= f.label :email_digest do %> + <%= f.check_box :email_digest, title: t('account.show.email_digest_label'), label: false %> + + <%= t("account.show.email_digest_label") %> + + <% end %> +
+ <%= f.submit t("account.show.save_changes_submit"), class: "button" %>
diff --git a/config/locales/en.yml b/config/locales/en.yml index c0a68815b..0051fef5c 100755 --- a/config/locales/en.yml +++ b/config/locales/en.yml @@ -16,6 +16,7 @@ en: save_changes_submit: Save changes subscription_to_website_newsletter_label: Receive by email website relevant information email_on_proposal_notification_label: Receive by email notifications about proposals + email_digest_label: Receive a summary of proposal notifications title: My account user_permission_debates: Participate on debates user_permission_info: With your account you can... diff --git a/config/locales/es.yml b/config/locales/es.yml index 2354e4742..7898cbd65 100755 --- a/config/locales/es.yml +++ b/config/locales/es.yml @@ -16,6 +16,7 @@ es: save_changes_submit: Guardar cambios subscription_to_website_newsletter_label: Recibir emails con información interesante sobre la web email_on_proposal_notification_label: Recibir emails con notificaciones sobre propuestas + email_digest_label: Recibir resumen de notificaciones sobre propuestas title: Mi cuenta user_permission_debates: Participar en debates user_permission_info: Con tu cuenta ya puedes... diff --git a/spec/features/account_spec.rb b/spec/features/account_spec.rb index f5ba747fb..f8ebf4e3a 100644 --- a/spec/features/account_spec.rb +++ b/spec/features/account_spec.rb @@ -36,6 +36,7 @@ feature 'Account' do check 'account_email_on_comment' check 'account_email_on_comment_reply' uncheck 'account_email_on_proposal_notification' + uncheck 'account_email_digest' click_button 'Save changes' expect(page).to have_content "Changes saved" @@ -45,7 +46,7 @@ feature 'Account' do expect(page).to have_selector("input[value='Larry Bird']") expect(find("#account_email_on_comment")).to be_checked expect(find("#account_email_on_comment_reply")).to be_checked - expect(find("#account_email_on_proposal_notification")).to_not be_checked + expect(find("#account_email_digest")).to_not be_checked end scenario 'Edit Organization' do diff --git a/spec/models/user_spec.rb b/spec/models/user_spec.rb index ca46ff68f..e9c05eeb3 100644 --- a/spec/models/user_spec.rb +++ b/spec/models/user_spec.rb @@ -89,6 +89,12 @@ describe User do expect(subject.email_on_proposal_notification).to eq(true) end end + + describe 'email_digest' do + it 'should be true by default' do + expect(subject.email_digest).to eq(true) + end + end end describe "administrator?" do From fd672940758e02774bec7c460afbc8ef56f823a3 Mon Sep 17 00:00:00 2001 From: rgarcia Date: Tue, 14 Jun 2016 18:20:36 +0200 Subject: [PATCH 037/126] adds option to receive direct messages --- app/controllers/account_controller.rb | 2 +- app/views/account/show.html.erb | 9 +++++++++ config/locales/en.yml | 1 + config/locales/es.yml | 1 + ...160614160949_add_email_on_direct_messages_to_users.rb | 5 +++++ db/schema.rb | 3 ++- spec/features/account_spec.rb | 2 ++ spec/models/user_spec.rb | 6 ++++++ 8 files changed, 27 insertions(+), 2 deletions(-) create mode 100644 db/migrate/20160614160949_add_email_on_direct_messages_to_users.rb diff --git a/app/controllers/account_controller.rb b/app/controllers/account_controller.rb index 8bcb5f4d0..496778e5f 100644 --- a/app/controllers/account_controller.rb +++ b/app/controllers/account_controller.rb @@ -25,7 +25,7 @@ class AccountController < ApplicationController if @account.organization? params.require(:account).permit(:phone_number, :email_on_comment, :email_on_comment_reply, :newsletter, organization_attributes: [:name, :responsible_name]) else - params.require(:account).permit(:username, :public_activity, :email_on_comment, :email_on_comment_reply, :email_on_proposal_notification, :email_digest, :newsletter) + params.require(:account).permit(:username, :public_activity, :email_on_comment, :email_on_comment_reply, :email_on_proposal_notification, :email_on_direct_message, :email_digest, :newsletter) end end diff --git a/app/views/account/show.html.erb b/app/views/account/show.html.erb index 2180ce5f9..3d93bc705 100644 --- a/app/views/account/show.html.erb +++ b/app/views/account/show.html.erb @@ -87,6 +87,15 @@ <% end %> +
+ <%= f.label :email_on_direct_message do %> + <%= f.check_box :email_on_direct_message, title: t('account.show.email_on_direct_message_label'), label: false %> + + <%= t("account.show.email_on_direct_message_label") %> + + <% end %> +
+ <%= f.submit t("account.show.save_changes_submit"), class: "button" %> diff --git a/config/locales/en.yml b/config/locales/en.yml index 0051fef5c..de1f1a485 100755 --- a/config/locales/en.yml +++ b/config/locales/en.yml @@ -16,6 +16,7 @@ en: save_changes_submit: Save changes subscription_to_website_newsletter_label: Receive by email website relevant information email_on_proposal_notification_label: Receive by email notifications about proposals + email_on_direct_message_label: Receive emails about direct messages email_digest_label: Receive a summary of proposal notifications title: My account user_permission_debates: Participate on debates diff --git a/config/locales/es.yml b/config/locales/es.yml index 7898cbd65..c5fa39c91 100755 --- a/config/locales/es.yml +++ b/config/locales/es.yml @@ -16,6 +16,7 @@ es: save_changes_submit: Guardar cambios subscription_to_website_newsletter_label: Recibir emails con información interesante sobre la web email_on_proposal_notification_label: Recibir emails con notificaciones sobre propuestas + email_on_direct_message_label: Recibir emails con mensajes directos email_digest_label: Recibir resumen de notificaciones sobre propuestas title: Mi cuenta user_permission_debates: Participar en debates diff --git a/db/migrate/20160614160949_add_email_on_direct_messages_to_users.rb b/db/migrate/20160614160949_add_email_on_direct_messages_to_users.rb new file mode 100644 index 000000000..db18e3f27 --- /dev/null +++ b/db/migrate/20160614160949_add_email_on_direct_messages_to_users.rb @@ -0,0 +1,5 @@ +class AddEmailOnDirectMessagesToUsers < ActiveRecord::Migration + def change + add_column :users, :email_on_direct_message, :boolean, default: true + end +end diff --git a/db/schema.rb b/db/schema.rb index c4fddf324..f5671b3a3 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: 20160613150659) do +ActiveRecord::Schema.define(version: 20160614160949) do # These are extensions that must be enabled in order to support this database enable_extension "plpgsql" @@ -461,6 +461,7 @@ ActiveRecord::Schema.define(version: 20160613150659) do t.datetime "date_of_birth" t.boolean "email_on_proposal_notification", default: true t.boolean "email_digest", default: true + t.boolean "email_on_direct_message", default: true end add_index "users", ["confirmation_token"], name: "index_users_on_confirmation_token", unique: true, using: :btree diff --git a/spec/features/account_spec.rb b/spec/features/account_spec.rb index f8ebf4e3a..b41d676d4 100644 --- a/spec/features/account_spec.rb +++ b/spec/features/account_spec.rb @@ -37,6 +37,7 @@ feature 'Account' do check 'account_email_on_comment_reply' uncheck 'account_email_on_proposal_notification' uncheck 'account_email_digest' + uncheck 'account_email_on_direct_message' click_button 'Save changes' expect(page).to have_content "Changes saved" @@ -47,6 +48,7 @@ feature 'Account' do expect(find("#account_email_on_comment")).to be_checked expect(find("#account_email_on_comment_reply")).to be_checked expect(find("#account_email_digest")).to_not be_checked + expect(find("#account_email_on_direct_message")).to_not be_checked end scenario 'Edit Organization' do diff --git a/spec/models/user_spec.rb b/spec/models/user_spec.rb index e9c05eeb3..698c4884c 100644 --- a/spec/models/user_spec.rb +++ b/spec/models/user_spec.rb @@ -95,6 +95,12 @@ describe User do expect(subject.email_digest).to eq(true) end end + + describe 'email_on_direct_message' do + it 'should be true by default' do + expect(subject.email_on_direct_message).to eq(true) + end + end end describe "administrator?" do From ce6072d17bbd46bc54163fbb5443cf90a2ea85db Mon Sep 17 00:00:00 2001 From: rgarcia Date: Tue, 14 Jun 2016 18:55:28 +0200 Subject: [PATCH 038/126] sends a copy of the direct message to the sender --- app/controllers/direct_messages_controller.rb | 3 +- app/mailers/mailer.rb | 13 +++++-- ...b => direct_message_for_receiver.html.erb} | 2 +- .../mailer/direct_message_for_sender.html.erb | 11 ++++++ config/locales/mailers.en.yml | 7 ++-- config/locales/mailers.es.yml | 7 ++-- spec/features/direct_messages_spec.rb | 7 ---- spec/features/emails_spec.rb | 35 +++++++++++++++++++ spec/support/common_actions.rb | 16 +++++++++ 9 files changed, 86 insertions(+), 15 deletions(-) rename app/views/mailer/{direct_message.html.erb => direct_message_for_receiver.html.erb} (70%) create mode 100644 app/views/mailer/direct_message_for_sender.html.erb diff --git a/app/controllers/direct_messages_controller.rb b/app/controllers/direct_messages_controller.rb index 912f186a3..07f39d941 100644 --- a/app/controllers/direct_messages_controller.rb +++ b/app/controllers/direct_messages_controller.rb @@ -12,7 +12,8 @@ class DirectMessagesController < ApplicationController @direct_message = DirectMessage.new(parsed_params) if @direct_message.save - Mailer.direct_message(@direct_message).deliver_later + Mailer.direct_message_for_receiver(@direct_message).deliver_later + Mailer.direct_message_for_sender(@direct_message).deliver_later redirect_to [@receiver, @direct_message], notice: I18n.t("flash.actions.create.direct_message") else render :new diff --git a/app/mailers/mailer.rb b/app/mailers/mailer.rb index d900fd17d..6916253f2 100644 --- a/app/mailers/mailer.rb +++ b/app/mailers/mailer.rb @@ -50,12 +50,21 @@ class Mailer < ApplicationMailer end end - def direct_message(direct_message) + def direct_message_for_receiver(direct_message) @direct_message = direct_message @receiver = @direct_message.receiver with_user(@receiver) do - mail(to: @receiver.email, subject: "Has recibido un nuevo mensaje privado") + mail(to: @receiver.email, subject: t('mailers.direct_message_for_receiver.subject')) + end + end + + def direct_message_for_sender(direct_message) + @direct_message = direct_message + @sender = @direct_message.sender + + with_user(@sender) do + mail(to: @sender.email, subject: t('mailers.direct_message_for_sender.subject')) end end diff --git a/app/views/mailer/direct_message.html.erb b/app/views/mailer/direct_message_for_receiver.html.erb similarity index 70% rename from app/views/mailer/direct_message.html.erb rename to app/views/mailer/direct_message_for_receiver.html.erb index 28235089b..d70c78a28 100644 --- a/app/views/mailer/direct_message.html.erb +++ b/app/views/mailer/direct_message_for_receiver.html.erb @@ -11,7 +11,7 @@ - <%= link_to user_url(@direct_message.sender_id), style: "font-family: 'Open Sans','Helvetica Neue',arial,sans-serif; background: #f7f5f2; border-radius: 6px; color: #3d3d66!important; font-weight: bold; margin: 0px; padding: 10px 15px; text-align: center; text-decoration: none; min-width: 200px; display: inline-block;", target: "_blank" do %> + <%= link_to user_url(@direct_message.sender), style: "font-family: 'Open Sans','Helvetica Neue',arial,sans-serif; background: #f7f5f2; border-radius: 6px; color: #3d3d66!important; font-weight: bold; margin: 0px; padding: 10px 15px; text-align: center; text-decoration: none; min-width: 200px; display: inline-block;", target: "_blank" do %> <%= image_tag('icon_mailer_reply.png', style: "border: 0; display: inline-block; width: 100%; max-width: 12px; vertical-align: sub;", alt: "") %> <%= t('mailers.direct_message.reply', sender: @direct_message.sender.name) %> diff --git a/app/views/mailer/direct_message_for_sender.html.erb b/app/views/mailer/direct_message_for_sender.html.erb new file mode 100644 index 000000000..219337705 --- /dev/null +++ b/app/views/mailer/direct_message_for_sender.html.erb @@ -0,0 +1,11 @@ + +

<%= @direct_message.receiver.name %>

+ +

+ <%= @direct_message.title %> +

+ +

+ <%= @direct_message.body %> +

+ diff --git a/config/locales/mailers.en.yml b/config/locales/mailers.en.yml index 66c1c75ea..ec6e7f45c 100755 --- a/config/locales/mailers.en.yml +++ b/config/locales/mailers.en.yml @@ -37,5 +37,8 @@ en: title: You received the following notifications share: Share comment: Comment proposal - direct_message: - reply: Reply to %{sender} \ No newline at end of file + direct_message_for_receiver: + subject: "You have received a new private message" + reply: Reply to %{sender} + direct_message_for_sender: + subject: "You have send a new private message" \ No newline at end of file diff --git a/config/locales/mailers.es.yml b/config/locales/mailers.es.yml index 36343267d..4defbd1ed 100644 --- a/config/locales/mailers.es.yml +++ b/config/locales/mailers.es.yml @@ -37,5 +37,8 @@ es: title: Has recibido las siguientes notificaciones share: Compartir comment: Comentar propuesta - direct_message: - reply: Responder a %{sender} \ No newline at end of file + direct_message_for_receiver: + subject: "Has recibido un nuevo mensaje privado" + reply: Responder a %{sender} + direct_message_for_sender: + subject: "Has enviado un nuevo mensaje privado" \ No newline at end of file diff --git a/spec/features/direct_messages_spec.rb b/spec/features/direct_messages_spec.rb index 142be8cbb..2ee1f4365 100644 --- a/spec/features/direct_messages_spec.rb +++ b/spec/features/direct_messages_spec.rb @@ -61,11 +61,4 @@ feature 'Direct messages' do expect(page).to have_content error_message end - context "Limits" do - - pending "Cannot send more than one notification within established interval" - pending "use timecop to make sure notifications can be sent after time interval" - - end - end \ No newline at end of file diff --git a/spec/features/emails_spec.rb b/spec/features/emails_spec.rb index 5894d40ed..237444f85 100644 --- a/spec/features/emails_spec.rb +++ b/spec/features/emails_spec.rb @@ -148,6 +148,41 @@ feature 'Emails' do expect(email).to have_body_text(spending_proposal.feasible_explanation) end + context "Direct Message" do + + scenario "Receiver email" do + sender = create(:user, :level_two) + receiver = create(:user, :level_two) + + direct_message = create_direct_message(sender, receiver) + + email = unread_emails_for(receiver.email).first + + expect(email).to have_subject("You have received a new private message") + expect(email).to have_body_text(direct_message.title) + expect(email).to have_body_text(direct_message.body) + expect(email).to have_body_text(direct_message.sender.name) + expect(email).to have_body_text(/#{user_path(direct_message.sender_id)}/) + end + + scenario "Sender email" do + sender = create(:user, :level_two) + receiver = create(:user, :level_two) + + direct_message = create_direct_message(sender, receiver) + + email = unread_emails_for(sender.email).first + + expect(email).to have_subject("You have send a new private message") + expect(email).to have_body_text(direct_message.title) + expect(email).to have_body_text(direct_message.body) + expect(email).to have_body_text(direct_message.receiver.name) + end + + pending "In the copy sent to the sender, display the receiver's name" + + end + context "Proposal notifications" do scenario "Proposal notification" do diff --git a/spec/support/common_actions.rb b/spec/support/common_actions.rb index 39faf03f5..8eba8b13d 100644 --- a/spec/support/common_actions.rb +++ b/spec/support/common_actions.rb @@ -214,4 +214,20 @@ module CommonActions Notification.last end + def create_direct_message(sender, receiver) + login_as(sender) + visit user_path(receiver) + + click_link "Send private message" + + expect(page).to have_content "Send private message to #{receiver.name}" + + fill_in 'direct_message_title', with: "Hey #{receiver.name}!" + fill_in 'direct_message_body', with: "How are you doing? This is #{sender.name}" + click_button "Send message" + + expect(page).to have_content "You message has been sent successfully." + DirectMessage.last + end + end From 28d12fe55bcb7bbf73fb7edc803022a1d419f738 Mon Sep 17 00:00:00 2001 From: rgarcia Date: Wed, 15 Jun 2016 10:43:02 +0200 Subject: [PATCH 039/126] removes sending individual proposal notifications via email --- app/controllers/account_controller.rb | 2 +- .../proposal_notifications_controller.rb | 3 - app/mailers/mailer.rb | 8 --- app/views/account/show.html.erb | 9 --- .../mailer/proposal_notification.html.erb | 29 ---------- config/locales/en.yml | 1 - config/locales/es.yml | 1 - config/locales/mailers.en.yml | 3 - config/locales/mailers.es.yml | 3 - spec/features/account_spec.rb | 1 - spec/features/emails_spec.rb | 56 ------------------- spec/features/proposal_notifications_spec.rb | 47 ---------------- spec/models/user_spec.rb | 6 -- 13 files changed, 1 insertion(+), 168 deletions(-) delete mode 100644 app/views/mailer/proposal_notification.html.erb diff --git a/app/controllers/account_controller.rb b/app/controllers/account_controller.rb index 496778e5f..9212eb4fa 100644 --- a/app/controllers/account_controller.rb +++ b/app/controllers/account_controller.rb @@ -25,7 +25,7 @@ class AccountController < ApplicationController if @account.organization? params.require(:account).permit(:phone_number, :email_on_comment, :email_on_comment_reply, :newsletter, organization_attributes: [:name, :responsible_name]) else - params.require(:account).permit(:username, :public_activity, :email_on_comment, :email_on_comment_reply, :email_on_proposal_notification, :email_on_direct_message, :email_digest, :newsletter) + params.require(:account).permit(:username, :public_activity, :email_on_comment, :email_on_comment_reply, :email_on_direct_message, :email_digest, :newsletter) end end diff --git a/app/controllers/proposal_notifications_controller.rb b/app/controllers/proposal_notifications_controller.rb index 1fcd9322a..fc9cdf3d8 100644 --- a/app/controllers/proposal_notifications_controller.rb +++ b/app/controllers/proposal_notifications_controller.rb @@ -13,9 +13,6 @@ class ProposalNotificationsController < ApplicationController if @notification.save @proposal.voters.each do |voter| Notification.add(voter.id, @notification) - if voter.email_on_proposal_notification? - Mailer.proposal_notification(@notification, voter).deliver_later - end end redirect_to @notification, notice: I18n.t("flash.actions.create.proposal_notification") else diff --git a/app/mailers/mailer.rb b/app/mailers/mailer.rb index 6916253f2..5f7dc5391 100644 --- a/app/mailers/mailer.rb +++ b/app/mailers/mailer.rb @@ -42,14 +42,6 @@ class Mailer < ApplicationMailer end end - def proposal_notification(notification, voter) - @notification = notification - - with_user(voter) do - mail(to: voter.email, subject: @notification.title + ": " + @notification.proposal.title) - end - end - def direct_message_for_receiver(direct_message) @direct_message = direct_message @receiver = @direct_message.receiver diff --git a/app/views/account/show.html.erb b/app/views/account/show.html.erb index 3d93bc705..98987626d 100644 --- a/app/views/account/show.html.erb +++ b/app/views/account/show.html.erb @@ -69,15 +69,6 @@ <% end %> -
- <%= f.label :email_on_proposal_notification do %> - <%= f.check_box :email_on_proposal_notification, title: t('account.show.email_on_proposal_notification_label'), label: false %> - - <%= t("account.show.email_on_proposal_notification_label") %> - - <% end %> -
-
<%= f.label :email_digest do %> <%= f.check_box :email_digest, title: t('account.show.email_digest_label'), label: false %> diff --git a/app/views/mailer/proposal_notification.html.erb b/app/views/mailer/proposal_notification.html.erb deleted file mode 100644 index 04ca39d86..000000000 --- a/app/views/mailer/proposal_notification.html.erb +++ /dev/null @@ -1,29 +0,0 @@ - -

- <%= @notification.proposal.title %> -

- -

- <%= @notification.body %> -

- - - - - - - - - -
- <%= link_to "#comments", style: "font-family: 'Open Sans','Helvetica Neue',arial,sans-serif; background: #f7f5f2; border-radius: 6px; color: #3d3d66!important; font-weight: bold; margin: 0px; padding: 10px 15px; text-align: center; text-decoration: none; min-width: 160px; display: inline-block;" do %> - <%= image_tag('icon_mailer_share.png', style: "border: 0; display: inline-block; width: 100%; max-width: 16px", alt: "") %> - <%= t('mailers.proposal_notification.share') %> - <% end %> - - <%= link_to "#social-share", style: "font-family: 'Open Sans','Helvetica Neue',arial,sans-serif; background: #f7f5f2; border-radius: 6px; color: #3d3d66!important; font-weight: bold; margin: 0px; padding: 10px 15px; text-align: center; text-decoration: none; min-width: 160px; display: inline-block;" do %> - <%= image_tag('icon_mailer_comment.png', style: "border: 0; display: inline-block; width: 100%; max-width: 16px; vertical-align: middle;", alt: "") %> - <%= t('mailers.proposal_notification.comment') %> - <% end %> -
- diff --git a/config/locales/en.yml b/config/locales/en.yml index de1f1a485..e78f9c4d0 100755 --- a/config/locales/en.yml +++ b/config/locales/en.yml @@ -15,7 +15,6 @@ en: public_activity_label: Keep my list of activities public save_changes_submit: Save changes subscription_to_website_newsletter_label: Receive by email website relevant information - email_on_proposal_notification_label: Receive by email notifications about proposals email_on_direct_message_label: Receive emails about direct messages email_digest_label: Receive a summary of proposal notifications title: My account diff --git a/config/locales/es.yml b/config/locales/es.yml index c5fa39c91..592bc9213 100755 --- a/config/locales/es.yml +++ b/config/locales/es.yml @@ -15,7 +15,6 @@ es: public_activity_label: Mostrar públicamente mi lista de actividades save_changes_submit: Guardar cambios subscription_to_website_newsletter_label: Recibir emails con información interesante sobre la web - email_on_proposal_notification_label: Recibir emails con notificaciones sobre propuestas email_on_direct_message_label: Recibir emails con mensajes directos email_digest_label: Recibir resumen de notificaciones sobre propuestas title: Mi cuenta diff --git a/config/locales/mailers.en.yml b/config/locales/mailers.en.yml index ec6e7f45c..7270f81ae 100755 --- a/config/locales/mailers.en.yml +++ b/config/locales/mailers.en.yml @@ -30,9 +30,6 @@ en: sorry: "Sorry for the inconvenience and we again thank you for your invaluable participation." subject: "Your investment project '%{code}' has been marked as unfeasible" unfeasible_html: "From the Madrid City Council we want to thank you for your participation in the participatory budgets of the city of Madrid. We regret to inform you that your proposal '%{title}' will be excluded from this participatory process for the following reason:" - proposal_notification: - share: Share - comment: Comment proposal proposal_notification_digest: title: You received the following notifications share: Share diff --git a/config/locales/mailers.es.yml b/config/locales/mailers.es.yml index 4defbd1ed..288fa189e 100644 --- a/config/locales/mailers.es.yml +++ b/config/locales/mailers.es.yml @@ -30,9 +30,6 @@ es: sorry: "Sentimos las molestias ocasionadas y volvemos a darte las gracias por tu inestimable participación." subject: "Tu propuesta de inversión '%{code}' ha sido marcada como inviable" unfeasible_html: "Desde el Ayuntamiento de Madrid queremos agradecer tu participación en los Presupuestos Participativos de la ciudad de Madrid. Lamentamos informarte de que tu propuesta '%{title}' quedará excluida de este proceso participativo por el siguiente motivo:" - proposal_notification: - share: Compartir - comment: Comentar propuesta proposal_notification_digest: title: Has recibido las siguientes notificaciones share: Compartir diff --git a/spec/features/account_spec.rb b/spec/features/account_spec.rb index b41d676d4..0d5da38b2 100644 --- a/spec/features/account_spec.rb +++ b/spec/features/account_spec.rb @@ -35,7 +35,6 @@ feature 'Account' do fill_in 'account_username', with: 'Larry Bird' check 'account_email_on_comment' check 'account_email_on_comment_reply' - uncheck 'account_email_on_proposal_notification' uncheck 'account_email_digest' uncheck 'account_email_on_direct_message' click_button 'Save changes' diff --git a/spec/features/emails_spec.rb b/spec/features/emails_spec.rb index 237444f85..3ea8f16b9 100644 --- a/spec/features/emails_spec.rb +++ b/spec/features/emails_spec.rb @@ -183,62 +183,6 @@ feature 'Emails' do end - context "Proposal notifications" do - - scenario "Proposal notification" do - author = create(:user) - - noelia = create(:user) - vega = create(:user) - cristina = create(:user) - - proposal = create(:proposal, author: author) - - create(:vote, voter: noelia, votable: proposal, vote_flag: true) - create(:vote, voter: vega, votable: proposal, vote_flag: true) - - reset_mailer - - login_as(author) - visit root_path - - visit new_proposal_notification_path(proposal_id: proposal.id) - - fill_in 'proposal_notification_title', with: "Thank you for supporting my proposal" - fill_in 'proposal_notification_body', with: "Please share it with others so we can make it happen!" - click_button "Send message" - - expect(page).to have_content "Your message has been sent correctly." - - expect(unread_emails_for(noelia.email).size).to eql parse_email_count(1) - expect(unread_emails_for(vega.email).size).to eql parse_email_count(1) - expect(unread_emails_for(cristina.email).size).to eql parse_email_count(0) - expect(unread_emails_for(author.email).size).to eql parse_email_count(0) - - email = open_last_email - expect(email).to have_subject("Thank you for supporting my proposal: #{proposal.title}") - expect(email).to have_body_text("Please share it with others so we can make it happen!") - expect(email).to have_body_text(proposal.title) - end - - scenario "Do not send email about proposal notifications unless set in preferences", :js do - author = create(:user) - voter = create(:user, email_on_proposal_notification: false) - - proposal = create(:proposal, author: author) - create(:vote, voter: voter, votable: proposal, vote_flag: true) - - login_as(author) - visit new_proposal_notification_path(proposal_id: proposal.id) - - fill_in 'proposal_notification_title', with: "Thank you for supporting my proposal" - fill_in 'proposal_notification_body', with: "Please share it with others so we can make it happen!" - click_button "Send message" - - expect { open_last_email }.to raise_error "No email has been sent!" - end - end - context "Proposal notification digest" do scenario "notifications for proposals that I have supported" do diff --git a/spec/features/proposal_notifications_spec.rb b/spec/features/proposal_notifications_spec.rb index 7785a1236..be8b146fd 100644 --- a/spec/features/proposal_notifications_spec.rb +++ b/spec/features/proposal_notifications_spec.rb @@ -51,53 +51,6 @@ feature 'Proposal Notifications' do expect(page).to have_link("the proposal's page", href: proposal_path(proposal)) end - context "Receivers" do - - scenario "Only send a digest to users that have the option set in their profile" do - user1 = create(:user, email_digest: true) - user2 = create(:user, email_digest: true) - user3 = create(:user, email_digest: false) - - proposal = create(:proposal) - - [user1, user2, user3].each do |user| - create(:vote, votable: proposal, voter: user) - end - - create_proposal_notification(proposal) - - reset_mailer - email_digest = EmailDigest.new - email_digest.create - - expect(unread_emails_for(user1.email).size).to eql parse_email_count(1) - expect(unread_emails_for(user2.email).size).to eql parse_email_count(1) - expect(unread_emails_for(user3.email).size).to eql parse_email_count(0) - end - - scenario "Only send a digest to users that have voted for a proposal" do - user1 = create(:user, email_digest: true) - user2 = create(:user, email_digest: true) - user3 = create(:user, email_digest: true) - - proposal = create(:proposal) - - [user1, user2].each do |user| - create(:vote, votable: proposal, voter: user) - end - - create_proposal_notification(proposal) - - reset_mailer - email_digest = EmailDigest.new - email_digest.create - - expect(unread_emails_for(user1.email).size).to eql parse_email_count(1) - expect(unread_emails_for(user2.email).size).to eql parse_email_count(1) - expect(unread_emails_for(user3.email).size).to eql parse_email_count(0) - end - - end context "Permissions" do scenario "Link to send the message" do diff --git a/spec/models/user_spec.rb b/spec/models/user_spec.rb index 698c4884c..143053c77 100644 --- a/spec/models/user_spec.rb +++ b/spec/models/user_spec.rb @@ -84,12 +84,6 @@ describe User do end end - describe 'email_on_proposal_notification' do - it 'should be true by default' do - expect(subject.email_on_proposal_notification).to eq(true) - end - end - describe 'email_digest' do it 'should be true by default' do expect(subject.email_digest).to eq(true) From cdc2bd67a4e99dfb8c0b597e5f4c2b0bfc4291c1 Mon Sep 17 00:00:00 2001 From: rgarcia Date: Wed, 15 Jun 2016 10:51:58 +0200 Subject: [PATCH 040/126] adds correct order for email action links --- app/views/mailer/proposal_notification_digest.html.erb | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/app/views/mailer/proposal_notification_digest.html.erb b/app/views/mailer/proposal_notification_digest.html.erb index 16e96260c..500a0fade 100644 --- a/app/views/mailer/proposal_notification_digest.html.erb +++ b/app/views/mailer/proposal_notification_digest.html.erb @@ -11,7 +11,7 @@ - <%= @notifications.each do |notification| %> + <% @notifications.each do |notification| %> @@ -32,12 +32,12 @@ From 95d244003e8b2731faeef2b14afccefac847d154 Mon Sep 17 00:00:00 2001 From: rgarcia Date: Wed, 15 Jun 2016 12:03:38 +0200 Subject: [PATCH 042/126] do not display link to send direct message --- app/views/users/show.html.erb | 4 ++-- spec/features/direct_messages_spec.rb | 15 +++++++++++++-- 2 files changed, 15 insertions(+), 4 deletions(-) diff --git a/app/views/users/show.html.erb b/app/views/users/show.html.erb index 31c62d13c..8b4428a09 100644 --- a/app/views/users/show.html.erb +++ b/app/views/users/show.html.erb @@ -2,11 +2,11 @@
- <% if @user != current_user %> + <% if @user != current_user && @user.email_on_direct_message? %> <%= link_to t("users.show.send_private_message"), new_user_direct_message_path(@user), class: "button hollow float-right" %> - + <% else %>
<%= t("users.show.no_private_messages") %>
diff --git a/spec/features/direct_messages_spec.rb b/spec/features/direct_messages_spec.rb index 2ee1f4365..119cbe6de 100644 --- a/spec/features/direct_messages_spec.rb +++ b/spec/features/direct_messages_spec.rb @@ -24,8 +24,8 @@ feature 'Direct messages' do context "Permissions" do - scenario "Link to send the message" do - sender = create(:user, :level_two) + scenario "Do not display link to send message to myself" do + sender = create(:user, :level_two) login_as(sender) visit user_path(sender) @@ -33,6 +33,17 @@ feature 'Direct messages' do expect(page).to_not have_link "Send private message" end + scenario "Do not display link if direct message for user not allowed" do + sender = create(:user, :level_two) + receiver = create(:user, :level_two, email_on_direct_message: false) + + login_as(sender) + visit user_path(receiver) + + expect(page).to have_content "This user doesn't accept private messages." + expect(page).to_not have_link "Send private message" + end + scenario "Accessing form directly" do user = create(:user) author = create(:user) From e2689d640c3c26b6d672eb707c421b924f1cc8c9 Mon Sep 17 00:00:00 2001 From: rgarcia Date: Wed, 15 Jun 2016 12:12:56 +0200 Subject: [PATCH 043/126] refactors notification helpers --- app/helpers/notifications_helper.rb | 11 +------ app/models/notification.rb | 11 +++++++ .../notifications/_notification.html.erb | 2 +- spec/helpers/notifications_helper_spec.rb | 25 --------------- spec/models/notification_spec.rb | 31 +++++++++++++++++++ 5 files changed, 44 insertions(+), 36 deletions(-) delete mode 100644 spec/helpers/notifications_helper_spec.rb diff --git a/app/helpers/notifications_helper.rb b/app/helpers/notifications_helper.rb index 6ec5f1b9e..2b907535f 100644 --- a/app/helpers/notifications_helper.rb +++ b/app/helpers/notifications_helper.rb @@ -1,13 +1,4 @@ module NotificationsHelper - def notification_action(notification) - case notification.notifiable_type - when "ProposalNotification" - "proposal_notification" - when "Comment" - "replies_to" - else - "comments_on" - end - end + end diff --git a/app/models/notification.rb b/app/models/notification.rb index 2e2bedc38..9695c1b01 100644 --- a/app/models/notification.rb +++ b/app/models/notification.rb @@ -33,6 +33,17 @@ class Notification < ActiveRecord::Base end end + def notifiable_action + case notifiable_type + when "ProposalNotification" + "proposal_notification" + when "Comment" + "replies_to" + else + "comments_on" + end + end + def linkable_resource notifiable.is_a?(ProposalNotification) ? notifiable.proposal : notifiable end diff --git a/app/views/notifications/_notification.html.erb b/app/views/notifications/_notification.html.erb index 237912a10..99b4b7def 100644 --- a/app/views/notifications/_notification.html.erb +++ b/app/views/notifications/_notification.html.erb @@ -2,7 +2,7 @@ <%= link_to notification do %>

- <%= t("notifications.index.#{notification_action(notification)}", + <%= t("notifications.index.#{notification.notifiable_action}", count: notification.counter) %> <%= notification.notifiable_title %> diff --git a/spec/helpers/notifications_helper_spec.rb b/spec/helpers/notifications_helper_spec.rb deleted file mode 100644 index ccb3b3a9d..000000000 --- a/spec/helpers/notifications_helper_spec.rb +++ /dev/null @@ -1,25 +0,0 @@ -require 'rails_helper' - -describe NotificationsHelper do - - describe "#notification_action" do - let(:debate) { create :debate } - let(:debate_comment) { create :comment, commentable: debate } - - context "when action was comment on a debate" do - it "returns correct text when someone comments on your debate" do - notification = create :notification, notifiable: debate - expect(notification_action(notification)).to eq "comments_on" - end - end - - context "when action was comment on a debate" do - it "returns correct text when someone replies to your comment" do - notification = create :notification, notifiable: debate_comment - expect(notification_action(notification)).to eq "replies_to" - end - end - end - - -end diff --git a/spec/models/notification_spec.rb b/spec/models/notification_spec.rb index 361211a51..fcf7cab4b 100644 --- a/spec/models/notification_spec.rb +++ b/spec/models/notification_spec.rb @@ -47,4 +47,35 @@ describe Notification do end end + describe "#notification_action" do + + context "when action was comment on a debate" do + it "returns correct text when someone comments on your debate" do + debate = create(:debate) + notification = create :notification, notifiable: debate + + expect(notification.notifiable_action).to eq "comments_on" + end + end + + context "when action was comment on a debate" do + it "returns correct text when someone replies to your comment" do + debate = create(:debate) + debate_comment = create :comment, commentable: debate + notification = create :notification, notifiable: debate_comment + + expect(notification.notifiable_action).to eq "replies_to" + end + end + + context "when action was proposal notification" do + it "returns correct text when the author created a proposal notification" do + proposal_notification = create(:proposal_notification) + notification = create :notification, notifiable: proposal_notification + + expect(notification.notifiable_action).to eq "proposal_notification" + end + end + end + end From 0c469bc362a073946dc3c3460ead5d7d37d5326f Mon Sep 17 00:00:00 2001 From: kikito Date: Wed, 15 Jun 2016 14:02:13 +0200 Subject: [PATCH 044/126] fixes the way permissions work for proposalnotifications --- app/models/abilities/common.rb | 4 +--- 1 file changed, 1 insertion(+), 3 deletions(-) diff --git a/app/models/abilities/common.rb b/app/models/abilities/common.rb index 994bf90c0..f82e78b58 100644 --- a/app/models/abilities/common.rb +++ b/app/models/abilities/common.rb @@ -50,9 +50,7 @@ module Abilities can :show, DirectMessage, sender_id: user.id end - can [:new, :create, :show], ProposalNotification do |notification| - notification.proposal.author_id == user.id - end + can [:create, :show], ProposalNotification, proposal: { author_id: user.id } can :create, Annotation can [:update, :destroy], Annotation, user_id: user.id From 19b6740d370c732461668b9e9a4c9fdf05ad666a Mon Sep 17 00:00:00 2001 From: rgarcia Date: Wed, 15 Jun 2016 16:46:54 +0200 Subject: [PATCH 045/126] updates email from field --- app/mailers/application_mailer.rb | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/app/mailers/application_mailer.rb b/app/mailers/application_mailer.rb index c1f3e4bb6..8838f522f 100644 --- a/app/mailers/application_mailer.rb +++ b/app/mailers/application_mailer.rb @@ -1,5 +1,5 @@ class ApplicationMailer < ActionMailer::Base helper :settings - default from: "participacion@madrid.es" + default from: "Decide Madrid " layout 'mailer' end From 60c1fdcb271fe00a581b2fcebeb11bbc9654bd50 Mon Sep 17 00:00:00 2001 From: Alberto Garcia Cabeza Date: Wed, 15 Jun 2016 16:54:13 +0200 Subject: [PATCH 046/126] Changes text to 'share proposal' --- config/locales/mailers.en.yml | 2 +- config/locales/mailers.es.yml | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/config/locales/mailers.en.yml b/config/locales/mailers.en.yml index 7270f81ae..6d91c52a1 100755 --- a/config/locales/mailers.en.yml +++ b/config/locales/mailers.en.yml @@ -32,7 +32,7 @@ en: unfeasible_html: "From the Madrid City Council we want to thank you for your participation in the participatory budgets of the city of Madrid. We regret to inform you that your proposal '%{title}' will be excluded from this participatory process for the following reason:" proposal_notification_digest: title: You received the following notifications - share: Share + share: Share proposal comment: Comment proposal direct_message_for_receiver: subject: "You have received a new private message" diff --git a/config/locales/mailers.es.yml b/config/locales/mailers.es.yml index 288fa189e..7593aac43 100644 --- a/config/locales/mailers.es.yml +++ b/config/locales/mailers.es.yml @@ -32,7 +32,7 @@ es: unfeasible_html: "Desde el Ayuntamiento de Madrid queremos agradecer tu participación en los Presupuestos Participativos de la ciudad de Madrid. Lamentamos informarte de que tu propuesta '%{title}' quedará excluida de este proceso participativo por el siguiente motivo:" proposal_notification_digest: title: Has recibido las siguientes notificaciones - share: Compartir + share: Compartir propuesta comment: Comentar propuesta direct_message_for_receiver: subject: "Has recibido un nuevo mensaje privado" From 06596ac4d80a0e56a1e9cbbbb7245ef2b29dd9ba Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Juanjo=20Baz=C3=A1n?= Date: Wed, 15 Jun 2016 17:01:50 +0200 Subject: [PATCH 047/126] adds author_of? helper method --- app/helpers/application_helper.rb | 5 +++++ spec/helpers/application_helper_spec.rb | 27 +++++++++++++++++++++++++ 2 files changed, 32 insertions(+) create mode 100644 spec/helpers/application_helper_spec.rb diff --git a/app/helpers/application_helper.rb b/app/helpers/application_helper.rb index c5f2e6aca..1f52f0eea 100644 --- a/app/helpers/application_helper.rb +++ b/app/helpers/application_helper.rb @@ -35,4 +35,9 @@ module ApplicationHelper } Redcarpet::Markdown.new(renderer, extensions).render(text).html_safe end + + def author_of?(authorable, user) + return false if authorable.blank? || user.blank? + authorable.author_id == user.id + end end diff --git a/spec/helpers/application_helper_spec.rb b/spec/helpers/application_helper_spec.rb new file mode 100644 index 000000000..61137912d --- /dev/null +++ b/spec/helpers/application_helper_spec.rb @@ -0,0 +1,27 @@ +require 'rails_helper' + +describe ApplicationHelper do + + describe "#author_of?" do + it "should be true if user is the author" do + user = create(:user) + proposal = create(:proposal, author: user) + expect(author_of?(proposal, user)).to eq true + end + + it "should be false if user is not the author" do + user = create(:user) + proposal = create(:proposal) + expect(author_of?(proposal, user)).to eq false + end + + it "should be false if user or authorable is nil" do + user = create(:user) + proposal = create(:proposal) + + expect(author_of?(nil, user)).to eq false + expect(author_of?(proposal, nil)).to eq false + end + end + +end \ No newline at end of file From e87fda2c8d030c8c8612d8b81a6cda24946fba5f Mon Sep 17 00:00:00 2001 From: Alberto Garcia Cabeza Date: Wed, 15 Jun 2016 17:03:33 +0200 Subject: [PATCH 048/126] Adds comments anchor on form link --- app/views/proposal_notifications/new.html.erb | 7 +++---- config/locales/en.yml | 2 +- config/locales/es.yml | 2 +- 3 files changed, 5 insertions(+), 6 deletions(-) diff --git a/app/views/proposal_notifications/new.html.erb b/app/views/proposal_notifications/new.html.erb index a5f829ecc..b76f218fe 100644 --- a/app/views/proposal_notifications/new.html.erb +++ b/app/views/proposal_notifications/new.html.erb @@ -7,10 +7,9 @@

<%= t("proposal_notifications.new.info_about_receivers_html", - count: @proposal.voters.count) %> - - <%= link_to t("proposal_notifications.new.proposal_page"), - proposal_path(@proposal) %> + count: @proposal.voters.count, + proposal_page: link_to(t("proposal_notifications.new.proposal_page"), + proposal_path(@proposal, anchor: "comments"))).html_safe %>

diff --git a/config/locales/en.yml b/config/locales/en.yml index e78f9c4d0..1002042d7 100755 --- a/config/locales/en.yml +++ b/config/locales/en.yml @@ -374,7 +374,7 @@ en: title_label: "Title" body_label: "Message" submit_button: "Send message" - info_about_receivers_html: "This message will be send to %{count} people and it will be visible in " + info_about_receivers_html: "This message will be send to %{count} people and it will be visible in %{proposal_page}." proposal_page: "the proposal's page" show: back: "Go back to my activity" diff --git a/config/locales/es.yml b/config/locales/es.yml index 592bc9213..30d573c37 100755 --- a/config/locales/es.yml +++ b/config/locales/es.yml @@ -374,7 +374,7 @@ es: title_label: "Título" body_label: "Mensaje" submit_button: "Enviar mensaje" - info_about_receivers_html: "Este mensaje se enviará a %{count} usuarios y se publicará en " + info_about_receivers_html: "Este mensaje se enviará a %{count} usuarios y se publicará en %{proposal_page}." proposal_page: "la página de la propuesta" show: back: "Volver a mi actividad" From 2dc39192b800886a65f0c5b1dfd59c691c2e72f4 Mon Sep 17 00:00:00 2001 From: Alberto Garcia Cabeza Date: Wed, 15 Jun 2016 17:13:44 +0200 Subject: [PATCH 049/126] Adds button to proposal's show to 'Send notification' --- app/assets/stylesheets/layout.scss | 4 ++++ app/views/proposals/show.html.erb | 5 +++++ app/views/users/_proposals.html.erb | 2 +- config/locales/en.yml | 3 ++- config/locales/es.yml | 3 ++- 5 files changed, 14 insertions(+), 3 deletions(-) diff --git a/app/assets/stylesheets/layout.scss b/app/assets/stylesheets/layout.scss index e9a9f1057..9152955dc 100644 --- a/app/assets/stylesheets/layout.scss +++ b/app/assets/stylesheets/layout.scss @@ -253,6 +253,10 @@ a { max-width: none; } +.button.float-right ~ .button.float-right { + margin: 0 $line-height/2; +} + // 02. Header // ---------- diff --git a/app/views/proposals/show.html.erb b/app/views/proposals/show.html.erb index 2153b23e5..7bb2a92a6 100644 --- a/app/views/proposals/show.html.erb +++ b/app/views/proposals/show.html.erb @@ -12,6 +12,11 @@
<%= render "shared/back_link" %> + <% if author_of?(@proposal, current_user) %> + <%= link_to t("proposals.show.send_notification"), new_proposal_notification_path(proposal_id: @proposal.id), + class: 'button hollow float-right' %> + <% end %> + <% if current_user && @proposal.editable_by?(current_user) %> <%= link_to edit_proposal_path(@proposal), class: 'edit-proposal button hollow float-right' do %> <%= t("proposals.show.edit_proposal_link") %> diff --git a/app/views/users/_proposals.html.erb b/app/views/users/_proposals.html.erb index a56b096f6..f50045635 100644 --- a/app/views/users/_proposals.html.erb +++ b/app/views/users/_proposals.html.erb @@ -9,7 +9,7 @@ <% if author? %>
<% end %> diff --git a/config/locales/en.yml b/config/locales/en.yml index 1002042d7..78ac956a7 100755 --- a/config/locales/en.yml +++ b/config/locales/en.yml @@ -365,6 +365,7 @@ en: retired_warning_link_to_explanation: Read the explanation before voting for it. retired: Proposal retired by the author share: Share + send_notification: Send notification update: form: submit_button: Save changes @@ -535,7 +536,7 @@ en: private_activity: This user decided to keep the activity list private send_private_message: "Send private message" proposals: - send_message: "Send message" + send_notification: "Send notification" retire: "Retire" retired: "Retired" votes: diff --git a/config/locales/es.yml b/config/locales/es.yml index 30d573c37..219a07dee 100755 --- a/config/locales/es.yml +++ b/config/locales/es.yml @@ -364,6 +364,7 @@ es: retired_warning: "El autor de esta propuesta considera que ya no debe seguir recogiendo apoyos." retired_warning_link_to_explanation: Revisa su explicación antes de apoyarla. retired: Propuesta retirada por el autor + send_notification: Enviar notificación share: Compartir update: form: @@ -535,7 +536,7 @@ es: private_activity: Este usuario ha decidido mantener en privado su lista de actividades send_private_message: "Enviar un mensaje privado" proposals: - send_message: "Enviar mensaje" + send_notification: "Enviar notificación" retire: "Retirar" retired: "Retirada" votes: From f606a3bcbef34931568412945df329bf865d3293 Mon Sep 17 00:00:00 2001 From: Alberto Garcia Cabeza Date: Wed, 15 Jun 2016 17:33:25 +0200 Subject: [PATCH 050/126] Adds link to unsubscribe in digest email --- .../mailer/proposal_notification_digest.html.erb | 12 ++++++++++++ 1 file changed, 12 insertions(+) diff --git a/app/views/mailer/proposal_notification_digest.html.erb b/app/views/mailer/proposal_notification_digest.html.erb index 500a0fade..eda614040 100644 --- a/app/views/mailer/proposal_notification_digest.html.erb +++ b/app/views/mailer/proposal_notification_digest.html.erb @@ -50,4 +50,16 @@
- <%= link_to proposal_url(notification.notifiable.proposal, anchor: "comments"), style: "font-family: 'Open Sans','Helvetica Neue',arial,sans-serif; background: #f7f5f2; border-radius: 6px; color: #3d3d66!important; font-weight: bold; margin: 0px; padding: 10px 15px; text-align: center; text-decoration: none; min-width: 160px; display: inline-block;" do %> + <%= link_to proposal_url(notification.notifiable.proposal, anchor: "social-share"), style: "font-family: 'Open Sans','Helvetica Neue',arial,sans-serif; background: #f7f5f2; border-radius: 6px; color: #3d3d66!important; font-weight: bold; margin: 0px; padding: 10px 15px; text-align: center; text-decoration: none; min-width: 160px; display: inline-block;" do %> <%= image_tag('icon_mailer_share.png', style: "border: 0; display: inline-block; width: 100%; max-width: 16px", alt: "") %> <%= t('mailers.proposal_notification_digest.share') %> <% end %> - <%= link_to proposal_url(notification.notifiable.proposal, anchor: "social-share"), style: "font-family: 'Open Sans','Helvetica Neue',arial,sans-serif; background: #f7f5f2; border-radius: 6px; color: #3d3d66!important; font-weight: bold; margin: 0px; padding: 10px 15px; text-align: center; text-decoration: none; min-width: 160px; display: inline-block; margin-left: 12px;" do %> + <%= link_to proposal_url(notification.notifiable.proposal, anchor: "comments"), style: "font-family: 'Open Sans','Helvetica Neue',arial,sans-serif; background: #f7f5f2; border-radius: 6px; color: #3d3d66!important; font-weight: bold; margin: 0px; padding: 10px 15px; text-align: center; text-decoration: none; min-width: 160px; display: inline-block; margin-left: 12px;" do %> <%= image_tag('icon_mailer_comment.png', style: "border: 0; display: inline-block; width: 100%; max-width: 16px; vertical-align: middle;", alt: "") %> <%= t('mailers.proposal_notification_digest.comment') %> <% end %> From 90148ffdca758dd4e7d3d7c18770b20f31c8dcff Mon Sep 17 00:00:00 2001 From: rgarcia Date: Wed, 15 Jun 2016 11:34:33 +0200 Subject: [PATCH 041/126] adds missing translation --- app/views/mailer/direct_message_for_receiver.html.erb | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/app/views/mailer/direct_message_for_receiver.html.erb b/app/views/mailer/direct_message_for_receiver.html.erb index d70c78a28..a6b366ce9 100644 --- a/app/views/mailer/direct_message_for_receiver.html.erb +++ b/app/views/mailer/direct_message_for_receiver.html.erb @@ -13,7 +13,7 @@ <%= link_to user_url(@direct_message.sender), style: "font-family: 'Open Sans','Helvetica Neue',arial,sans-serif; background: #f7f5f2; border-radius: 6px; color: #3d3d66!important; font-weight: bold; margin: 0px; padding: 10px 15px; text-align: center; text-decoration: none; min-width: 200px; display: inline-block;", target: "_blank" do %> <%= image_tag('icon_mailer_reply.png', style: "border: 0; display: inline-block; width: 100%; max-width: 12px; vertical-align: sub;", alt: "") %> - <%= t('mailers.direct_message.reply', + <%= t('mailers.direct_message_for_receiver.reply', sender: @direct_message.sender.name) %> <% end %> - <%= link_to t("users.proposals.send_message"), new_proposal_notification_path(proposal_id: proposal.id), + <%= link_to t("users.proposals.send_notification"), new_proposal_notification_path(proposal_id: proposal.id), class: 'button hollow' %>
<% end %> + + + + + + + + From 0366d7efb25f7a8d5ace7d1ef6e5c2ab7a483571 Mon Sep 17 00:00:00 2001 From: Alberto Garcia Cabeza Date: Wed, 15 Jun 2016 17:55:42 +0200 Subject: [PATCH 051/126] Adds translations on mailer message --- app/views/mailer/proposal_notification_digest.html.erb | 4 +++- config/locales/mailers.en.yml | 2 ++ config/locales/mailers.es.yml | 2 ++ 3 files changed, 7 insertions(+), 1 deletion(-) diff --git a/app/views/mailer/proposal_notification_digest.html.erb b/app/views/mailer/proposal_notification_digest.html.erb index eda614040..cd194de7f 100644 --- a/app/views/mailer/proposal_notification_digest.html.erb +++ b/app/views/mailer/proposal_notification_digest.html.erb @@ -56,7 +56,9 @@ diff --git a/config/locales/mailers.en.yml b/config/locales/mailers.en.yml index 6d91c52a1..099b3c182 100755 --- a/config/locales/mailers.en.yml +++ b/config/locales/mailers.en.yml @@ -34,6 +34,8 @@ en: title: You received the following notifications share: Share proposal comment: Comment proposal + unsubscribe: "If you don't want receive proposal's notification, visit %{account} and unckeck 'Receive a summary of proposal notifications'." + unsubscribe_account: My account direct_message_for_receiver: subject: "You have received a new private message" reply: Reply to %{sender} diff --git a/config/locales/mailers.es.yml b/config/locales/mailers.es.yml index 7593aac43..e510ec2d8 100644 --- a/config/locales/mailers.es.yml +++ b/config/locales/mailers.es.yml @@ -34,6 +34,8 @@ es: title: Has recibido las siguientes notificaciones share: Compartir propuesta comment: Comentar propuesta + unsubscribe: "Si no quieres recibir notificaciones de propuestas, puedes entrar en %{account} y desmarcar la opción 'Recibir resumen de notificaciones sobre propuestas'." + unsubscribe_account: Mi cuenta direct_message_for_receiver: subject: "Has recibido un nuevo mensaje privado" reply: Responder a %{sender} From 0f1d6c1f191ad3b02eab6aa2ce7f1f9a07dbfbc2 Mon Sep 17 00:00:00 2001 From: Alberto Garcia Cabeza Date: Wed, 15 Jun 2016 20:44:32 +0200 Subject: [PATCH 052/126] Adds text in footer about not replying --- app/views/layouts/mailer.html.erb | 4 ++++ app/views/mailer/proposal_notification_digest.html.erb | 2 +- config/locales/mailers.en.yml | 1 + config/locales/mailers.es.yml | 1 + 4 files changed, 7 insertions(+), 1 deletion(-) diff --git a/app/views/layouts/mailer.html.erb b/app/views/layouts/mailer.html.erb index e0533ca50..f90b8e39d 100644 --- a/app/views/layouts/mailer.html.erb +++ b/app/views/layouts/mailer.html.erb @@ -32,6 +32,10 @@ diff --git a/app/views/mailer/proposal_notification_digest.html.erb b/app/views/mailer/proposal_notification_digest.html.erb index cd194de7f..97a309d81 100644 --- a/app/views/mailer/proposal_notification_digest.html.erb +++ b/app/views/mailer/proposal_notification_digest.html.erb @@ -17,7 +17,7 @@ diff --git a/config/locales/mailers.en.yml b/config/locales/mailers.en.yml index 72c201dd7..81efbd30c 100755 --- a/config/locales/mailers.en.yml +++ b/config/locales/mailers.en.yml @@ -32,7 +32,7 @@ en: subject: "Your investment project '%{code}' has been marked as unfeasible" unfeasible_html: "From the Madrid City Council we want to thank you for your participation in the participatory budgets of the city of Madrid. We regret to inform you that your proposal '%{title}' will be excluded from this participatory process for the following reason:" proposal_notification_digest: - title: You received the following notifications + title: "Proposal notifications in %{org_name}" share: Share proposal comment: Comment proposal unsubscribe: "If you don't want receive proposal's notification, visit %{account} and unckeck 'Receive a summary of proposal notifications'." diff --git a/config/locales/mailers.es.yml b/config/locales/mailers.es.yml index 41abb53d8..0c9d81ac0 100644 --- a/config/locales/mailers.es.yml +++ b/config/locales/mailers.es.yml @@ -32,7 +32,7 @@ es: subject: "Tu propuesta de inversión '%{code}' ha sido marcada como inviable" unfeasible_html: "Desde el Ayuntamiento de Madrid queremos agradecer tu participación en los Presupuestos Participativos de la ciudad de Madrid. Lamentamos informarte de que tu propuesta '%{title}' quedará excluida de este proceso participativo por el siguiente motivo:" proposal_notification_digest: - title: Has recibido las siguientes notificaciones + title: "Notificaciones de propuestas en %{org_name}" share: Compartir propuesta comment: Comentar propuesta unsubscribe: "Si no quieres recibir notificaciones de propuestas, puedes entrar en %{account} y desmarcar la opción 'Recibir resumen de notificaciones sobre propuestas'." From dd7629b5af5d769ff9b435bb30d850a99617d24c Mon Sep 17 00:00:00 2001 From: Alberto Garcia Cabeza Date: Wed, 15 Jun 2016 21:00:56 +0200 Subject: [PATCH 054/126] Adds notification menu and message for empty notifications --- app/views/proposals/_comments.html.erb | 7 ------- app/views/proposals/_notifications.html.erb | 6 ++++++ app/views/proposals/show.html.erb | 6 ++---- config/locales/en.yml | 2 +- config/locales/es.yml | 2 +- 5 files changed, 10 insertions(+), 13 deletions(-) diff --git a/app/views/proposals/_comments.html.erb b/app/views/proposals/_comments.html.erb index 094814cf1..ed52b1b66 100644 --- a/app/views/proposals/_comments.html.erb +++ b/app/views/proposals/_comments.html.erb @@ -2,13 +2,6 @@
- <% if @notifications.blank? %> -

- <%= t("proposals.show.comments_title") %> - (<%= @proposal.comments_count %>) -

- <% end %> - <%= render 'shared/wide_order_selector', i18n_namespace: "comments" %> <% if user_signed_in? %> diff --git a/app/views/proposals/_notifications.html.erb b/app/views/proposals/_notifications.html.erb index 44bb9f4a2..69389b2c5 100644 --- a/app/views/proposals/_notifications.html.erb +++ b/app/views/proposals/_notifications.html.erb @@ -1,6 +1,12 @@
+ <% if @notifications.blank? %> +
+ <%= t('proposals.show.no_notifications') %> +
+ <% end %> + <% @notifications.each do |notification| %>

<%= notification.title %>

<%= notification.created_at.to_date %>

diff --git a/app/views/proposals/show.html.erb b/app/views/proposals/show.html.erb index 7bb2a92a6..3a9869d83 100644 --- a/app/views/proposals/show.html.erb +++ b/app/views/proposals/show.html.erb @@ -124,10 +124,8 @@ <% end %>
- <% if @notifications.present? %> - <%= render "proposals/filter_subnav" %> - <%= render "proposals/notifications" %> - <% end %> + <%= render "proposals/filter_subnav" %> + <%= render "proposals/notifications" %>
<%= render "proposals/comments" %> diff --git a/config/locales/en.yml b/config/locales/en.yml index 78ac956a7..65d97f997 100755 --- a/config/locales/en.yml +++ b/config/locales/en.yml @@ -356,7 +356,6 @@ en: other: "%{count} comments" zero: No comments comments_tab: Comments - comments_title: Comments edit_proposal_link: Edit flag: This proposal has been flagged as inappropriate by several users. login_to_comment: You must %{signin} or %{signup} to leave a comment. @@ -366,6 +365,7 @@ en: retired: Proposal retired by the author share: Share send_notification: Send notification + no_notifications: "This proposal has any notifications." update: form: submit_button: Save changes diff --git a/config/locales/es.yml b/config/locales/es.yml index 219a07dee..9ac646584 100755 --- a/config/locales/es.yml +++ b/config/locales/es.yml @@ -356,7 +356,6 @@ es: other: "%{count} Comentarios" zero: Sin comentarios comments_tab: Comentarios - comments_title: Comentarios edit_proposal_link: Editar propuesta flag: Esta propuesta ha sido marcada como inapropiada por varios usuarios. login_to_comment: Necesitas %{signin} o %{signup} para comentar. @@ -366,6 +365,7 @@ es: retired: Propuesta retirada por el autor send_notification: Enviar notificación share: Compartir + no_notifications: "Esta propuesta no tiene notificaciones." update: form: submit_button: Guardar cambios From 419ced5a18394c5a91586e6b79dfc08b3bd16ace Mon Sep 17 00:00:00 2001 From: Alberto Garcia Cabeza Date: Wed, 15 Jun 2016 21:14:56 +0200 Subject: [PATCH 055/126] Adds text to form new --- app/views/proposal_notifications/new.html.erb | 6 +++++- config/locales/en.yml | 2 +- config/locales/es.yml | 2 +- 3 files changed, 7 insertions(+), 3 deletions(-) diff --git a/app/views/proposal_notifications/new.html.erb b/app/views/proposal_notifications/new.html.erb index b76f218fe..678e00088 100644 --- a/app/views/proposal_notifications/new.html.erb +++ b/app/views/proposal_notifications/new.html.erb @@ -1,5 +1,5 @@
-
+
<%= render 'shared/back_link' %>

<%= t("proposal_notifications.new.title") %>

@@ -12,7 +12,11 @@ proposal_path(@proposal, anchor: "comments"))).html_safe %>

+
+
+
+
<%= form_for @notification do |f| %> <%= render "shared/errors", resource: @notification %> diff --git a/config/locales/en.yml b/config/locales/en.yml index 65d97f997..7d59f0520 100755 --- a/config/locales/en.yml +++ b/config/locales/en.yml @@ -375,7 +375,7 @@ en: title_label: "Title" body_label: "Message" submit_button: "Send message" - info_about_receivers_html: "This message will be send to %{count} people and it will be visible in %{proposal_page}." + info_about_receivers_html: "This message will be send to %{count} people and it will be visible in %{proposal_page}.
Message are not sent immediately, users will receive periodically an email with all proposal notifications." proposal_page: "the proposal's page" show: back: "Go back to my activity" diff --git a/config/locales/es.yml b/config/locales/es.yml index 9ac646584..488d0d689 100755 --- a/config/locales/es.yml +++ b/config/locales/es.yml @@ -375,7 +375,7 @@ es: title_label: "Título" body_label: "Mensaje" submit_button: "Enviar mensaje" - info_about_receivers_html: "Este mensaje se enviará a %{count} usuarios y se publicará en %{proposal_page}." + info_about_receivers_html: "Este mensaje se enviará a %{count} usuarios y se publicará en %{proposal_page}.
El mensaje no se enviará inmediatamente, los usuarios recibirán periódicamente un email con todas las notificaciones de propuestas." proposal_page: "la página de la propuesta" show: back: "Volver a mi actividad" From c83e831cb7a11e19da873ebb0ad25475ce40b4f6 Mon Sep 17 00:00:00 2001 From: Alberto Garcia Cabeza Date: Wed, 15 Jun 2016 21:28:17 +0200 Subject: [PATCH 056/126] Adds link to not receive direct messages --- .../direct_message_for_receiver.html.erb | 14 ++++++++++++++ .../proposal_notification_digest.html.erb | 18 +++++++++--------- config/locales/mailers.en.yml | 2 ++ config/locales/mailers.es.yml | 2 ++ 4 files changed, 27 insertions(+), 9 deletions(-) diff --git a/app/views/mailer/direct_message_for_receiver.html.erb b/app/views/mailer/direct_message_for_receiver.html.erb index a6b366ce9..eb1e56fe7 100644 --- a/app/views/mailer/direct_message_for_receiver.html.erb +++ b/app/views/mailer/direct_message_for_receiver.html.erb @@ -20,4 +20,18 @@
+

+ Si no quieres recibir notificaciones de propuestas, puedes entrar en Mi cuenta y desmarcar la opción "Recibir resumen de notificaciones sobre propuestas". +

+

- Si no quieres recibir notificaciones de propuestas, puedes entrar en Mi cuenta y desmarcar la opción "Recibir resumen de notificaciones sobre propuestas". + <%= t('mailers.proposal_notification_digest.unsubscribe', + account: link_to(t('mailers.proposal_notification_digest.unsubscribe_account'), + account_path)).html_safe %>

<%= setting['org_name'] %>

+ +

+ <%= t('mailers.no_reply') %>

+

- <%= link_to notification.notifiable.title, notification_url(notification) %> + <%= link_to notification.notifiable.title, notification_url(notification), style: "color: #2895F1; text-decoration: none;" %>

<%= notification.notifiable.proposal.title %> •  diff --git a/config/locales/mailers.en.yml b/config/locales/mailers.en.yml index 099b3c182..72c201dd7 100755 --- a/config/locales/mailers.en.yml +++ b/config/locales/mailers.en.yml @@ -1,6 +1,7 @@ --- en: mailers: + no_reply: "This message was sent from an email address that does not accept replies." comment: hi: Hi new_comment_by_html: There is a new comment from %{commenter} diff --git a/config/locales/mailers.es.yml b/config/locales/mailers.es.yml index e510ec2d8..41abb53d8 100644 --- a/config/locales/mailers.es.yml +++ b/config/locales/mailers.es.yml @@ -1,6 +1,7 @@ --- es: mailers: + no_reply: "Este mensaje se ha enviado desde una dirección de correo electrónico que no admite respuestas." comment: hi: Hola new_comment_by_html: Hay un nuevo comentario de %{commenter} en From 017ccfb3786a9222e624a23d9ff72e7dfce0dac2 Mon Sep 17 00:00:00 2001 From: Alberto Garcia Cabeza Date: Wed, 15 Jun 2016 20:49:29 +0200 Subject: [PATCH 053/126] Changes title and subject in email --- app/mailers/mailer.rb | 2 +- app/views/mailer/proposal_notification_digest.html.erb | 3 ++- config/locales/mailers.en.yml | 2 +- config/locales/mailers.es.yml | 2 +- 4 files changed, 5 insertions(+), 4 deletions(-) diff --git a/app/mailers/mailer.rb b/app/mailers/mailer.rb index 5f7dc5391..d987e34cc 100644 --- a/app/mailers/mailer.rb +++ b/app/mailers/mailer.rb @@ -64,7 +64,7 @@ class Mailer < ApplicationMailer @notifications = user.notifications.where(notifiable_type: "ProposalNotification") with_user(user) do - mail(to: user.email, subject: "Email digest") + mail(to: user.email, subject: t('mailers.proposal_notification_digest.title', org_name: Setting['org_name'])) end end diff --git a/app/views/mailer/proposal_notification_digest.html.erb b/app/views/mailer/proposal_notification_digest.html.erb index 97a309d81..b9592b21a 100644 --- a/app/views/mailer/proposal_notification_digest.html.erb +++ b/app/views/mailer/proposal_notification_digest.html.erb @@ -4,7 +4,8 @@

- <%= t('mailers.proposal_notification_digest.title') %> + <%= t('mailers.proposal_notification_digest.title', + org_name: Setting['org_name']) %>

+ + + + + + + +
+

+ <%= t('mailers.direct_message_for_receiver.unsubscribe', + account: link_to(t('mailers.proposal_notification_digest.unsubscribe_account'), + account_path, style: "color: #2895F1; text-decoration: none;")).html_safe %> +

+
diff --git a/app/views/mailer/proposal_notification_digest.html.erb b/app/views/mailer/proposal_notification_digest.html.erb index b9592b21a..626d46885 100644 --- a/app/views/mailer/proposal_notification_digest.html.erb +++ b/app/views/mailer/proposal_notification_digest.html.erb @@ -56,13 +56,13 @@ -

- <%= t('mailers.proposal_notification_digest.unsubscribe', - account: link_to(t('mailers.proposal_notification_digest.unsubscribe_account'), - account_path)).html_safe %> -

- - - - +

+ <%= t('mailers.proposal_notification_digest.unsubscribe', + account: link_to(t('mailers.proposal_notification_digest.unsubscribe_account'), + account_path, style: "color: #2895F1; text-decoration: none;")).html_safe %> +

+ + + + diff --git a/config/locales/mailers.en.yml b/config/locales/mailers.en.yml index 81efbd30c..bcf622836 100755 --- a/config/locales/mailers.en.yml +++ b/config/locales/mailers.en.yml @@ -40,5 +40,7 @@ en: direct_message_for_receiver: subject: "You have received a new private message" reply: Reply to %{sender} + unsubscribe: "If you don't want receive direct messages, visit %{account} and unckeck 'Receive emails about direct messages'." + unsubscribe_account: My account direct_message_for_sender: subject: "You have send a new private message" \ No newline at end of file diff --git a/config/locales/mailers.es.yml b/config/locales/mailers.es.yml index 0c9d81ac0..84b2a240e 100644 --- a/config/locales/mailers.es.yml +++ b/config/locales/mailers.es.yml @@ -40,5 +40,7 @@ es: direct_message_for_receiver: subject: "Has recibido un nuevo mensaje privado" reply: Responder a %{sender} + unsubscribe: "Si no quieres recibir mensajes directos, puedes entrar en %{account} y desmarcar la opción 'Recibir emails con mensajes directos'." + unsubscribe_account: Mi cuenta direct_message_for_sender: subject: "Has enviado un nuevo mensaje privado" \ No newline at end of file From 9f7b49838dc51fc1ff9ed8113ece6c8ca7a41b7f Mon Sep 17 00:00:00 2001 From: Alberto Garcia Cabeza Date: Wed, 15 Jun 2016 21:37:36 +0200 Subject: [PATCH 057/126] Improves texts for the sender's email --- app/views/mailer/direct_message_for_sender.html.erb | 10 +++++++--- config/locales/mailers.en.yml | 3 ++- config/locales/mailers.es.yml | 5 +++-- 3 files changed, 12 insertions(+), 6 deletions(-) diff --git a/app/views/mailer/direct_message_for_sender.html.erb b/app/views/mailer/direct_message_for_sender.html.erb index 219337705..4cf832414 100644 --- a/app/views/mailer/direct_message_for_sender.html.erb +++ b/app/views/mailer/direct_message_for_sender.html.erb @@ -1,9 +1,13 @@ -

<%= @direct_message.receiver.name %>

-

+

+ <%= t('mailers.direct_message_for_sender.title_html', + receiver: @direct_message.receiver.name ) %> +

+ +

<%= @direct_message.title %> -

+

<%= @direct_message.body %> diff --git a/config/locales/mailers.en.yml b/config/locales/mailers.en.yml index bcf622836..c2e2b5d85 100755 --- a/config/locales/mailers.en.yml +++ b/config/locales/mailers.en.yml @@ -43,4 +43,5 @@ en: unsubscribe: "If you don't want receive direct messages, visit %{account} and unckeck 'Receive emails about direct messages'." unsubscribe_account: My account direct_message_for_sender: - subject: "You have send a new private message" \ No newline at end of file + subject: "You have send a new private message" + title_html: "You have send a new private message to %{receiver} with the content:" \ No newline at end of file diff --git a/config/locales/mailers.es.yml b/config/locales/mailers.es.yml index 84b2a240e..bde81ec86 100644 --- a/config/locales/mailers.es.yml +++ b/config/locales/mailers.es.yml @@ -40,7 +40,8 @@ es: direct_message_for_receiver: subject: "Has recibido un nuevo mensaje privado" reply: Responder a %{sender} - unsubscribe: "Si no quieres recibir mensajes directos, puedes entrar en %{account} y desmarcar la opción 'Recibir emails con mensajes directos'." + unsubscribe: "Si no quieres recibir mensajes privados, puedes entrar en %{account} y desmarcar la opción 'Recibir emails con mensajes directos'." unsubscribe_account: Mi cuenta direct_message_for_sender: - subject: "Has enviado un nuevo mensaje privado" \ No newline at end of file + subject: "Has enviado un nuevo mensaje privado" + title_html: "Has enviado un nuevo mensaje privado a %{receiver} con el siguiente contenido:" \ No newline at end of file From 25ebb325d12d99aa615874c4649f65bab04d62dd Mon Sep 17 00:00:00 2001 From: rgarcia Date: Thu, 16 Jun 2016 11:10:26 +0200 Subject: [PATCH 058/126] limits maximum number of messages able to send per day --- app/models/direct_message.rb | 18 ++++++ app/models/user.rb | 3 +- config/locales/activerecord.en.yml | 4 ++ config/locales/activerecord.es.yml | 4 ++ db/seeds.rb | 1 + spec/features/direct_messages_spec.rb | 29 +++++++++ spec/models/direct_message_spec.rb | 85 +++++++++++++++++++++++++++ 7 files changed, 143 insertions(+), 1 deletion(-) create mode 100644 spec/models/direct_message_spec.rb diff --git a/app/models/direct_message.rb b/app/models/direct_message.rb index 32cf6ac58..14083f2c7 100644 --- a/app/models/direct_message.rb +++ b/app/models/direct_message.rb @@ -1,4 +1,22 @@ class DirectMessage < ActiveRecord::Base belongs_to :sender, class_name: 'User', foreign_key: 'sender_id' belongs_to :receiver, class_name: 'User', foreign_key: 'receiver_id' + + validates :title, presence: true + validates :body, presence: true + validates :sender, presence: true + validates :receiver, presence: true + validate :max_per_day + + scope :today, lambda { where('DATE(created_at) = ?', Date.today) } + + def max_per_day + return if errors.any? + max = Setting[:direct_message_max_per_day] + + if sender.direct_messages_sent.today.count >= max.to_i + errors.add(:title, I18n.t('activerecord.errors.models.direct_message.attributes.max_per_day.invalid', max: max)) + end + end + end diff --git a/app/models/user.rb b/app/models/user.rb index a3b719859..7240c8929 100644 --- a/app/models/user.rb +++ b/app/models/user.rb @@ -23,7 +23,8 @@ class User < ActiveRecord::Base has_many :spending_proposals, foreign_key: :author_id has_many :failed_census_calls has_many :notifications - has_many :direct_messages + has_many :direct_messages_sent, class_name: 'DirectMessage', foreign_key: :sender_id + has_many :direct_messages_received, class_name: 'DirectMessage', foreign_key: :receiver_id belongs_to :geozone validates :username, presence: true, if: :username_required? diff --git a/config/locales/activerecord.en.yml b/config/locales/activerecord.en.yml index 524c8906c..9b48c1fc2 100644 --- a/config/locales/activerecord.en.yml +++ b/config/locales/activerecord.en.yml @@ -78,6 +78,10 @@ en: attributes: tag_list: less_than_or_equal_to: "tags must be less than or equal to %{count}" + direct_message: + attributes: + max_per_day: + invalid: "You can only send a maximum of %{max} direct messages per day" proposal: attributes: tag_list: diff --git a/config/locales/activerecord.es.yml b/config/locales/activerecord.es.yml index 1999631ab..f14022255 100644 --- a/config/locales/activerecord.es.yml +++ b/config/locales/activerecord.es.yml @@ -78,6 +78,10 @@ es: attributes: tag_list: less_than_or_equal_to: "los temas deben ser menor o igual que %{count}" + direct_message: + attributes: + max_per_day: + invalid: "Sólo puedes enviar %{max} mensajes directos por día" proposal: attributes: tag_list: diff --git a/db/seeds.rb b/db/seeds.rb index 5a6db1574..5644fe493 100644 --- a/db/seeds.rb +++ b/db/seeds.rb @@ -77,3 +77,4 @@ Setting['banner-img.banner-img-three'] = "Banner image 3" # Proposal notifications Setting['proposal_notification_minimum_interval_in_days '] = 3 +Setting['direct_message_max_per_day '] = 3 \ No newline at end of file diff --git a/spec/features/direct_messages_spec.rb b/spec/features/direct_messages_spec.rb index 119cbe6de..76b7a150c 100644 --- a/spec/features/direct_messages_spec.rb +++ b/spec/features/direct_messages_spec.rb @@ -72,4 +72,33 @@ feature 'Direct messages' do expect(page).to have_content error_message end + context "Limits" do + + background do + Setting[:direct_message_max_per_day] = 3 + end + + scenario "Can only send a maximum number of direct messages per day" do + sender = create(:user, :level_two) + receiver = create(:user, :level_two) + + 3.times { create(:direct_message, sender: sender) } + + login_as(sender) + visit user_path(receiver) + + click_link "Send private message" + + expect(page).to have_content "Send private message to #{receiver.name}" + + fill_in 'direct_message_title', with: "Hey!" + fill_in 'direct_message_body', with: "How are you doing?" + click_button "Send message" + + expect(page).to have_content "You can only send a maximum of 3 direct messages per day" + expect(page).to_not have_content "You message has been sent successfully." + end + + end + end \ No newline at end of file diff --git a/spec/models/direct_message_spec.rb b/spec/models/direct_message_spec.rb new file mode 100644 index 000000000..e982f9e56 --- /dev/null +++ b/spec/models/direct_message_spec.rb @@ -0,0 +1,85 @@ +require 'rails_helper' + +describe DirectMessage do + + let(:direct_message) { build(:direct_message) } + + before(:each) do + Setting[:direct_message_max_per_day] = 3 + end + + it "should be valid" do + expect(direct_message).to be_valid + end + + it "should not be valid without a title" do + direct_message.title = nil + expect(direct_message).to_not be_valid + end + + it "should not be valid without a body" do + direct_message.body = nil + expect(direct_message).to_not be_valid + end + + it "should not be valid without an associated sender" do + direct_message.sender = nil + expect(direct_message).to_not be_valid + end + + it "should not be valid without an associated receiver" do + direct_message.receiver = nil + expect(direct_message).to_not be_valid + end + + describe "maximum number of direct messages per day" do + + it "should not be valid if above maximum" do + sender = create(:user) + direct_message1 = create(:direct_message, sender: sender) + direct_message2 = create(:direct_message, sender: sender) + direct_message3 = create(:direct_message, sender: sender) + + direct_message4 = build(:direct_message, sender: sender) + expect(direct_message4).to_not be_valid + end + + it "should be valid if below maximum" do + sender = create(:user) + direct_message1 = create(:direct_message, sender: sender) + direct_message2 = create(:direct_message, sender: sender) + + direct_message3 = build(:direct_message) + expect(direct_message).to be_valid + end + + it "should be valid if no direct_messages sent" do + direct_message = build(:direct_message) + + expect(direct_message).to be_valid + end + + end + + describe "scopes" do + + describe "today" do + it "should return direct messages created today" do + direct_message1 = create(:direct_message, created_at: Time.zone.now.beginning_of_day + 3.hours) + direct_message2 = create(:direct_message, created_at: Time.zone.now) + direct_message3 = create(:direct_message, created_at: Time.zone.now.end_of_day) + + expect(DirectMessage.today.count).to eq 3 + end + + it "should not return direct messages created another day" do + direct_message1 = create(:direct_message, created_at: 1.day.ago) + direct_message2 = create(:direct_message, created_at: 1.day.from_now) + + expect(DirectMessage.today.count).to eq 0 + end + end + + end + +end \ No newline at end of file From 91860cb4097908cd21b9cbccbd64001cec6a7bef Mon Sep 17 00:00:00 2001 From: rgarcia Date: Thu, 16 Jun 2016 11:23:03 +0200 Subject: [PATCH 059/126] validates that a user does not want to receive direct messages --- app/views/direct_messages/new.html.erb | 19 +++++++++-- config/locales/en.yml | 4 +++ config/locales/es.yml | 5 +++ spec/features/direct_messages_spec.rb | 44 ++++++++++++++++++-------- 4 files changed, 56 insertions(+), 16 deletions(-) diff --git a/app/views/direct_messages/new.html.erb b/app/views/direct_messages/new.html.erb index 4c888ccd0..3413f26f0 100644 --- a/app/views/direct_messages/new.html.erb +++ b/app/views/direct_messages/new.html.erb @@ -3,11 +3,24 @@ <%= render 'shared/back_link' %>

- <%= t("users.direct_messages.new.title", - receiver: @receiver.name) %> + <%= t("users.direct_messages.new.title", receiver: @receiver.name) %>

- <% if can? :create, @direct_message %> + <% if not current_user %> +
+

+ <%= t("users.direct_messages.new.authenticate", + signin: link_to(t("users.direct_messages.new.signin"), new_user_session_path), + signup: link_to(t("users.direct_messages.new.signup"), new_user_registration_path)).html_safe %> +

+
+ <% elsif not @receiver.email_on_direct_message? %> +
+

+ <%= t("users.direct_messages.new.direct_messages_bloqued") %> +

+
+ <% elsif can? :create, @direct_message %> <%= form_for [@receiver, @direct_message] do |f| %> <%= render "shared/errors", resource: @direct_message %> diff --git a/config/locales/en.yml b/config/locales/en.yml index e78f9c4d0..eb28cf18d 100755 --- a/config/locales/en.yml +++ b/config/locales/en.yml @@ -504,11 +504,15 @@ en: direct_messages: new: body_label: Message + direct_messages_bloqued: "This user has decided not to receive direct messages" submit_button: Send message title: Send private message to %{receiver} title_label: Title verified_only: To send a private message %{verify_account} verify_account: verify your account + authenticate: You must %{signin} or %{signup} to continue. + signin: sign in + signup: sign up show: receiver: Message sent to %{receiver} show: diff --git a/config/locales/es.yml b/config/locales/es.yml index 592bc9213..bf46a8258 100755 --- a/config/locales/es.yml +++ b/config/locales/es.yml @@ -143,6 +143,7 @@ es: accept_terms_title: Acepto la Política de privacidad y las Condiciones de uso conditions: Condiciones de uso debate: el debate + direct_message: el mensaje privado error: error errors: errores not_saved: 'impidieron guardar %{resource}:' @@ -504,11 +505,15 @@ es: direct_messages: new: body_label: "Mensaje" + direct_messages_bloqued: "Este usuarios ha decidido no recibir mensajes directos" submit_button: "Enviar mensaje" title: Enviar mensaje privado a %{receiver} title_label: "Título" verified_only: Para enviar un mensaje privado %{verify_account} verify_account: verifica tu cuenta + authenticate: Necesitas %{signin} o %{signup}. + signin: iniciar sesión + signup: registrarte show: receiver: Mensaje enviado a %{receiver} show: diff --git a/spec/features/direct_messages_spec.rb b/spec/features/direct_messages_spec.rb index 76b7a150c..8ec949e9a 100644 --- a/spec/features/direct_messages_spec.rb +++ b/spec/features/direct_messages_spec.rb @@ -2,6 +2,10 @@ require 'rails_helper' feature 'Direct messages' do + background do + Setting[:direct_message_max_per_day] = 3 + end + scenario "Create" do sender = create(:user, :level_two) receiver = create(:user, :level_two) @@ -44,19 +48,37 @@ feature 'Direct messages' do expect(page).to_not have_link "Send private message" end - scenario "Accessing form directly" do - user = create(:user) - author = create(:user) - proposal = create(:proposal, author: author) + scenario "Unverified user" do + sender = create(:user) + receiver = create(:user) - login_as(user) - visit new_proposal_notification_path(proposal_id: proposal.id) + login_as(sender) + visit new_user_direct_message_path(receiver) - expect(current_path).to eq(proposals_path) - expect(page).to have_content("You do not have permission to carry out the action") + expect(page).to have_content "To send a private message verify your account" + expect(page).to_not have_link "Send private message" end - pending "unverified user" + scenario "User not logged in" do + sender = create(:user) + receiver = create(:user) + + visit new_user_direct_message_path(receiver) + + expect(page).to have_content "You must sign in or sign up to continue." + expect(page).to_not have_link "Send private message" + end + + scenario "Accessing form directly" do + sender = create(:user, :level_two) + receiver = create(:user, :level_two, email_on_direct_message: false) + + login_as(sender) + visit new_user_direct_message_path(receiver) + + expect(page).to have_content("This user has decided not to receive direct messages") + expect(page).to_not have_css("#direct_message_title") + end end @@ -74,10 +96,6 @@ feature 'Direct messages' do context "Limits" do - background do - Setting[:direct_message_max_per_day] = 3 - end - scenario "Can only send a maximum number of direct messages per day" do sender = create(:user, :level_two) receiver = create(:user, :level_two) From 18dd9c95f35a7e9bf6b0fd5bda8b3c64e1bd22e9 Mon Sep 17 00:00:00 2001 From: rgarcia Date: Thu, 16 Jun 2016 12:06:26 +0200 Subject: [PATCH 060/126] fixes specs --- app/controllers/management/proposals_controller.rb | 1 + app/views/mailer/direct_message_for_receiver.html.erb | 4 ++-- app/views/mailer/proposal_notification_digest.html.erb | 2 +- config/i18n-tasks.yml | 1 + config/locales/en.yml | 1 + db/seeds.rb | 2 +- spec/features/comments/proposals_spec.rb | 5 ++++- spec/features/emails_spec.rb | 3 ++- spec/features/proposal_notifications_spec.rb | 6 +++--- spec/support/common_actions.rb | 3 ++- 10 files changed, 18 insertions(+), 10 deletions(-) diff --git a/app/controllers/management/proposals_controller.rb b/app/controllers/management/proposals_controller.rb index 4f6ca18c4..2ce74d6d5 100644 --- a/app/controllers/management/proposals_controller.rb +++ b/app/controllers/management/proposals_controller.rb @@ -13,6 +13,7 @@ class Management::ProposalsController < Management::BaseController def show super + @notifications = @proposal.notifications redirect_to management_proposal_path(@proposal), status: :moved_permanently if request.path != management_proposal_path(@proposal) end diff --git a/app/views/mailer/direct_message_for_receiver.html.erb b/app/views/mailer/direct_message_for_receiver.html.erb index eb1e56fe7..2523f3502 100644 --- a/app/views/mailer/direct_message_for_receiver.html.erb +++ b/app/views/mailer/direct_message_for_receiver.html.erb @@ -27,8 +27,8 @@

<%= t('mailers.direct_message_for_receiver.unsubscribe', - account: link_to(t('mailers.proposal_notification_digest.unsubscribe_account'), - account_path, style: "color: #2895F1; text-decoration: none;")).html_safe %> + account: link_to(t('mailers.direct_message_for_receiver.unsubscribe_account'), + account_url, style: "color: #2895F1; text-decoration: none;")).html_safe %>

diff --git a/app/views/mailer/proposal_notification_digest.html.erb b/app/views/mailer/proposal_notification_digest.html.erb index 626d46885..0b839150f 100644 --- a/app/views/mailer/proposal_notification_digest.html.erb +++ b/app/views/mailer/proposal_notification_digest.html.erb @@ -59,7 +59,7 @@

<%= t('mailers.proposal_notification_digest.unsubscribe', account: link_to(t('mailers.proposal_notification_digest.unsubscribe_account'), - account_path, style: "color: #2895F1; text-decoration: none;")).html_safe %> + account_url, style: "color: #2895F1; text-decoration: none;")).html_safe %>

diff --git a/config/i18n-tasks.yml b/config/i18n-tasks.yml index d24cc6eab..250ed18f9 100644 --- a/config/i18n-tasks.yml +++ b/config/i18n-tasks.yml @@ -96,6 +96,7 @@ search: ignore_missing: - 'unauthorized.*' - 'activerecord.errors.models.proposal_notification.*' + - 'activerecord.errors.models.direct_message.*' - 'errors.messages.blank' - 'errors.messages.taken' - 'devise.failure.invalid' diff --git a/config/locales/en.yml b/config/locales/en.yml index 64ee8fb6f..b16f1092a 100755 --- a/config/locales/en.yml +++ b/config/locales/en.yml @@ -143,6 +143,7 @@ en: accept_terms_title: I agree to the Privacy Policy and the Terms and conditions of use conditions: Terms and conditions of use debate: Debate + direct_message: private message error: error errors: errors not_saved: 'prevented this %{resource} from being saved:' diff --git a/db/seeds.rb b/db/seeds.rb index 5644fe493..4a4741a07 100644 --- a/db/seeds.rb +++ b/db/seeds.rb @@ -77,4 +77,4 @@ Setting['banner-img.banner-img-three'] = "Banner image 3" # Proposal notifications Setting['proposal_notification_minimum_interval_in_days '] = 3 -Setting['direct_message_max_per_day '] = 3 \ No newline at end of file +Setting['direct_message_max_per_day'] = 3 \ No newline at end of file diff --git a/spec/features/comments/proposals_spec.rb b/spec/features/comments/proposals_spec.rb index 53b1006c3..8312176cd 100644 --- a/spec/features/comments/proposals_spec.rb +++ b/spec/features/comments/proposals_spec.rb @@ -168,7 +168,10 @@ feature 'Commenting proposals' do within "#comments" do expect(page).to have_content 'Have you thought about...?' - expect(page).to have_content '(1)' + end + + within "#tab-comments-label" do + expect(page).to have_content 'Comments (1)' end end diff --git a/spec/features/emails_spec.rb b/spec/features/emails_spec.rb index 3ea8f16b9..f793b5bb7 100644 --- a/spec/features/emails_spec.rb +++ b/spec/features/emails_spec.rb @@ -205,7 +205,7 @@ feature 'Emails' do email_digest.create email = open_last_email - expect(email).to have_subject("Email digest") + expect(email).to have_subject("Proposal notifications in Consul") expect(email).to deliver_to(user.email) expect(email).to have_body_text(proposal1.title) @@ -226,6 +226,7 @@ feature 'Emails' do expect(email).to have_body_text(proposal2.author.name) expect(email).to_not have_body_text(proposal3.title) + expect(email).to have_body_text(/#{account_path}/) end end diff --git a/spec/features/proposal_notifications_spec.rb b/spec/features/proposal_notifications_spec.rb index be8b146fd..6092289f0 100644 --- a/spec/features/proposal_notifications_spec.rb +++ b/spec/features/proposal_notifications_spec.rb @@ -12,7 +12,7 @@ feature 'Proposal Notifications' do click_link "My activity" within("#proposal_#{proposal.id}") do - click_link "Send message" + click_link "Send notification" end fill_in 'proposal_notification_title', with: "Thank you for supporting my proposal" @@ -48,7 +48,7 @@ feature 'Proposal Notifications' do visit new_proposal_notification_path(proposal_id: proposal.id) expect(page).to have_content "This message will be send to 7 people and it will be visible in the proposal's page" - expect(page).to have_link("the proposal's page", href: proposal_path(proposal)) + expect(page).to have_link("the proposal's page", href: proposal_path(proposal, anchor: 'comments')) end context "Permissions" do @@ -62,7 +62,7 @@ feature 'Proposal Notifications' do visit user_path(author) within("#proposal_#{proposal.id}") do - expect(page).to have_link "Send message" + expect(page).to have_link "Send notification" end login_as(user) diff --git a/spec/support/common_actions.rb b/spec/support/common_actions.rb index 8eba8b13d..80bdde907 100644 --- a/spec/support/common_actions.rb +++ b/spec/support/common_actions.rb @@ -203,7 +203,7 @@ module CommonActions click_link "My activity" within("#proposal_#{proposal.id}") do - click_link "Send message" + click_link "Send notification" end fill_in 'proposal_notification_title', with: "Thank you for supporting my proposal #{proposal.title}" @@ -224,6 +224,7 @@ module CommonActions fill_in 'direct_message_title', with: "Hey #{receiver.name}!" fill_in 'direct_message_body', with: "How are you doing? This is #{sender.name}" + click_button "Send message" expect(page).to have_content "You message has been sent successfully." From 7f20d4eb23bf159786b4096e07b83adb12573a61 Mon Sep 17 00:00:00 2001 From: Alberto Garcia Cabeza Date: Thu, 16 Jun 2016 13:44:06 +0200 Subject: [PATCH 061/126] Improves styles for admin pages --- app/assets/stylesheets/admin.scss | 17 +++++++++++++++++ app/views/admin/comments/index.html.erb | 4 ++-- app/views/admin/proposals/index.html.erb | 4 ++-- 3 files changed, 21 insertions(+), 4 deletions(-) diff --git a/app/assets/stylesheets/admin.scss b/app/assets/stylesheets/admin.scss index f52045c7b..e99392fc1 100644 --- a/app/assets/stylesheets/admin.scss +++ b/app/assets/stylesheets/admin.scss @@ -111,6 +111,23 @@ body.admin { padding: $line-height !important; } +@include breakpoint(medium) { + + tr { + + .on-hover-block { + display: none; + } + + &:hover .on-hover-block { + display: block; + margin: 0; + margin-top: $line-height/2; + width: 100%; + } + } +} + @include breakpoint(medium) { tr { diff --git a/app/views/admin/comments/index.html.erb b/app/views/admin/comments/index.html.erb index 4166be938..75493857c 100644 --- a/app/views/admin/comments/index.html.erb +++ b/app/views/admin/comments/index.html.erb @@ -20,12 +20,12 @@ restore_admin_comment_path(comment, request.query_parameters), method: :put, data: { confirm: t("admin.actions.confirm") }, - class: "button hollow on-hover" %> + class: "button hollow on-hover-block" %> <% unless comment.confirmed_hide? %> <%= link_to t("admin.actions.confirm_hide"), confirm_hide_admin_comment_path(comment, request.query_parameters), method: :put, - class: "button hollow warning on-hover" %> + class: "button hollow warning on-hover-block" %> <% end %> diff --git a/app/views/admin/proposals/index.html.erb b/app/views/admin/proposals/index.html.erb index cbe1e6d74..d929843b1 100644 --- a/app/views/admin/proposals/index.html.erb +++ b/app/views/admin/proposals/index.html.erb @@ -27,12 +27,12 @@ restore_admin_proposal_path(proposal, request.query_parameters), method: :put, data: { confirm: t("admin.actions.confirm") }, - class: "button hollow on-hover" %> + class: "button hollow on-hover-block" %> <% unless proposal.confirmed_hide? %> <%= link_to t("admin.actions.confirm_hide"), confirm_hide_admin_proposal_path(proposal, request.query_parameters), method: :put, - class: "button hollow warning on-hover" %> + class: "button hollow warning on-hover-block" %> <% end %> From 86fcd4fa76e8702b8966d3e033376f74107401e7 Mon Sep 17 00:00:00 2001 From: rgarcia Date: Thu, 16 Jun 2016 15:45:33 +0200 Subject: [PATCH 062/126] removes blank space in setting's key --- db/seeds.rb | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/db/seeds.rb b/db/seeds.rb index 4a4741a07..86847a64e 100644 --- a/db/seeds.rb +++ b/db/seeds.rb @@ -76,5 +76,5 @@ Setting['banner-img.banner-img-two'] = "Banner image 2" Setting['banner-img.banner-img-three'] = "Banner image 3" # Proposal notifications -Setting['proposal_notification_minimum_interval_in_days '] = 3 +Setting['proposal_notification_minimum_interval_in_days'] = 3 Setting['direct_message_max_per_day'] = 3 \ No newline at end of file From 8ee7d535ba74d099f5f0e804495cb1f64cc0cfa1 Mon Sep 17 00:00:00 2001 From: rgarcia Date: Thu, 16 Jun 2016 15:54:19 +0200 Subject: [PATCH 063/126] generic message for max_per_day setting --- app/models/direct_message.rb | 2 +- config/locales/activerecord.en.yml | 2 +- config/locales/activerecord.es.yml | 2 +- spec/features/direct_messages_spec.rb | 2 +- 4 files changed, 4 insertions(+), 4 deletions(-) diff --git a/app/models/direct_message.rb b/app/models/direct_message.rb index 14083f2c7..476194aea 100644 --- a/app/models/direct_message.rb +++ b/app/models/direct_message.rb @@ -15,7 +15,7 @@ class DirectMessage < ActiveRecord::Base max = Setting[:direct_message_max_per_day] if sender.direct_messages_sent.today.count >= max.to_i - errors.add(:title, I18n.t('activerecord.errors.models.direct_message.attributes.max_per_day.invalid', max: max)) + errors.add(:title, I18n.t('activerecord.errors.models.direct_message.attributes.max_per_day.invalid')) end end diff --git a/config/locales/activerecord.en.yml b/config/locales/activerecord.en.yml index 9b48c1fc2..07791e53c 100644 --- a/config/locales/activerecord.en.yml +++ b/config/locales/activerecord.en.yml @@ -81,7 +81,7 @@ en: direct_message: attributes: max_per_day: - invalid: "You can only send a maximum of %{max} direct messages per day" + invalid: "You have reached the maximum number of private messages per day" proposal: attributes: tag_list: diff --git a/config/locales/activerecord.es.yml b/config/locales/activerecord.es.yml index f14022255..d5b7f0005 100644 --- a/config/locales/activerecord.es.yml +++ b/config/locales/activerecord.es.yml @@ -81,7 +81,7 @@ es: direct_message: attributes: max_per_day: - invalid: "Sólo puedes enviar %{max} mensajes directos por día" + invalid: "Has llegado al número máximo de mensajes privados por día" proposal: attributes: tag_list: diff --git a/spec/features/direct_messages_spec.rb b/spec/features/direct_messages_spec.rb index 8ec949e9a..3c822de5c 100644 --- a/spec/features/direct_messages_spec.rb +++ b/spec/features/direct_messages_spec.rb @@ -113,7 +113,7 @@ feature 'Direct messages' do fill_in 'direct_message_body', with: "How are you doing?" click_button "Send message" - expect(page).to have_content "You can only send a maximum of 3 direct messages per day" + expect(page).to have_content "You have reached the maximum number of private messages per day" expect(page).to_not have_content "You message has been sent successfully." end From d40af1e94c8a2fb7498192166d7ee819f61d2ba3 Mon Sep 17 00:00:00 2001 From: rgarcia Date: Thu, 16 Jun 2016 16:05:09 +0200 Subject: [PATCH 064/126] do not display button to send message to myself --- app/views/users/show.html.erb | 18 ++++++++++-------- 1 file changed, 10 insertions(+), 8 deletions(-) diff --git a/app/views/users/show.html.erb b/app/views/users/show.html.erb index 8b4428a09..c264d336f 100644 --- a/app/views/users/show.html.erb +++ b/app/views/users/show.html.erb @@ -2,14 +2,16 @@
- <% if @user != current_user && @user.email_on_direct_message? %> - <%= link_to t("users.show.send_private_message"), - new_user_direct_message_path(@user), - class: "button hollow float-right" %> - <% else %> -
- <%= t("users.show.no_private_messages") %> -
+ <% if @user != current_user %> + <% if @user.email_on_direct_message? %> + <%= link_to t("users.show.send_private_message"), + new_user_direct_message_path(@user), + class: "button hollow float-right" %> + <% else %> +
+ <%= t("users.show.no_private_messages") %> +
+ <% end %> <% end %>

From 38fded40d8d4c4ac84ef1e1f4151003b4df4dc41 Mon Sep 17 00:00:00 2001 From: Alberto Garcia Cabeza Date: Thu, 16 Jun 2016 16:22:48 +0200 Subject: [PATCH 065/126] Changes translations --- config/locales/es.yml | 4 ++-- config/locales/mailers.es.yml | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/config/locales/es.yml b/config/locales/es.yml index a3922ef5f..620499ace 100755 --- a/config/locales/es.yml +++ b/config/locales/es.yml @@ -15,7 +15,7 @@ es: public_activity_label: Mostrar públicamente mi lista de actividades save_changes_submit: Guardar cambios subscription_to_website_newsletter_label: Recibir emails con información interesante sobre la web - email_on_direct_message_label: Recibir emails con mensajes directos + email_on_direct_message_label: Recibir emails con mensajes privados email_digest_label: Recibir resumen de notificaciones sobre propuestas title: Mi cuenta user_permission_debates: Participar en debates @@ -506,7 +506,7 @@ es: direct_messages: new: body_label: "Mensaje" - direct_messages_bloqued: "Este usuarios ha decidido no recibir mensajes directos" + direct_messages_bloqued: "Este usuario ha decidido no recibir mensajes privados" submit_button: "Enviar mensaje" title: Enviar mensaje privado a %{receiver} title_label: "Título" diff --git a/config/locales/mailers.es.yml b/config/locales/mailers.es.yml index bde81ec86..d90636c32 100644 --- a/config/locales/mailers.es.yml +++ b/config/locales/mailers.es.yml @@ -40,7 +40,7 @@ es: direct_message_for_receiver: subject: "Has recibido un nuevo mensaje privado" reply: Responder a %{sender} - unsubscribe: "Si no quieres recibir mensajes privados, puedes entrar en %{account} y desmarcar la opción 'Recibir emails con mensajes directos'." + unsubscribe: "Si no quieres recibir mensajes privados, puedes entrar en %{account} y desmarcar la opción 'Recibir emails con mensajes privados'." unsubscribe_account: Mi cuenta direct_message_for_sender: subject: "Has enviado un nuevo mensaje privado" From 1c4a572993da91b7276a45b1e69c0df78a12d3ed Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Juanjo=20Baz=C3=A1n?= Date: Thu, 16 Jun 2016 16:58:05 +0200 Subject: [PATCH 066/126] removes deprecated roadmap "If you have a roadmap, you are locked in an old version of the future" - David Heinemeier Hansson --- README.md | 4 ---- README_ES.md | 4 ---- ROADMAP_ES.md | 26 -------------------------- 3 files changed, 34 deletions(-) delete mode 100644 ROADMAP_ES.md diff --git a/README.md b/README.md index ba1c6cf21..025ebaaf7 100644 --- a/README.md +++ b/README.md @@ -16,10 +16,6 @@ This is the opensource code repository of the eParticipation website originally Development started on [2015 July 15th](https://github.com/consul/consul/commit/8db36308379accd44b5de4f680a54c41a0cc6fc6). Code was deployed to production on 2015 september 7th to [decide.madrid.es](https://decide.madrid.es). Since then new features are added often. You can take a look at a roadmap and future features in the [open issues list](https://github.com/consul/consul/issues). -## Roadmap - -See [ROADMAP_ES.md](ROADMAP_ES.md) - ## Tech stack The application backend is written in the [Ruby language](https://www.ruby-lang.org/) using the [Ruby on Rails](http://rubyonrails.org/) framework. diff --git a/README_ES.md b/README_ES.md index 455215abe..a15763604 100644 --- a/README_ES.md +++ b/README_ES.md @@ -16,10 +16,6 @@ Este es el repositorio de código abierto de la Aplicación de Participación Ci El desarrollo de esta aplicación comenzó el [15 de Julio de 2015](https://github.com/consul/consul/commit/8db36308379accd44b5de4f680a54c41a0cc6fc6) y el código fue puesto en producción el día 7 de Septiembre de 2015 en [decide.madrid.es](https://decide.madrid.es). Desde entonces se le añaden mejoras y funcionalidades constantemente. La evolución y futura lista de funcionalidades a implementar se pueden consultar en la lista de [tareas por hacer](https://github.com/consul/consul/issues). -## Hoja de ruta - -Ver fichero [ROADMAP_ES.md](ROADMAP_ES.md) - ## Tecnología El backend de esta aplicación se desarrolla con el lenguaje de programación [Ruby](https://www.ruby-lang.org/) sobre el *framework* [Ruby on Rails](http://rubyonrails.org/). diff --git a/ROADMAP_ES.md b/ROADMAP_ES.md deleted file mode 100644 index 9e53b53c8..000000000 --- a/ROADMAP_ES.md +++ /dev/null @@ -1,26 +0,0 @@ -## Hoja de ruta - -Las necesidades y líneas de desarrollo de Consul a corto plazo se actualizan continuamente, y son añadidas como Issues https://github.com/consul/consul/issues La hoja de ruta de desarrollo a medio plazo comprende lo siguiente: - -## Debates y propuestas - -Entre las mejoras a desarrollar destacamos las siguientes: -- Búsquedas avanzadas -- Notificaciones de usuarios -- Listas de correo informativas para los usuarios -- Clasificaciones temáticas y locales -- Mejora del sistema de etiquetado -- Sistema de identificación de propuestas similares -- Mejora de algoritmos de ordenación -- Ampliación de licencias de contenidos -- Añadido de idiomas disponibles -- Universalización del código, y facilitación de adaptación a diferentes sistemas locales -- Creación de sección de procesos participativos ad-hoc - -## Presupuestos participativos - -Este espacio permitirá que una cierta cantidad de dinero se distribuya por decisión ciudadana. Para ello permitirá: recibir propuestas para este fin; que dichas propuestas sean tasadas y evaluadas por un cierto perfil de usuarios mostrando dicho trabajo junto a las mismas; mostrar las propuestas de tal forma que los usuarios verificados puedan votar un conjunto de ellas acorde con la cantidad de dinero reservada. El mecanismo contemplará mecanismos de pre-selección y selección, además de categorizaciones geográficas o temáticas de las propuestas. - -## Legislación colaborativa - -Este módulo permitirá la participación ciudadana en todas las fases de un desarrollo legislativo. Desde la propuesta y selección de los redactores y expertos de la legislación, pasando por la fase de debate y propuesta asociada a la misma (que a su vez se dividirá en espacios de debate libre y mecanismos de pregunta-respuesta), hasta la redacción colaborativa y la revisión detallada del texto creado. El módulo permitirá activar independientemente las diferentes fases del proceso, de tal forma que su uso pueda extenderse mucho más allá del caso de la redacción colaborativa. From 0abc9c8376a2c6f07253e797edd3d80525ba80dd Mon Sep 17 00:00:00 2001 From: rgarcia Date: Thu, 16 Jun 2016 17:42:16 +0200 Subject: [PATCH 067/126] adds stats for direct messages and proposal notifications --- app/controllers/admin/stats_controller.rb | 9 +++++ .../admin/stats/direct_messages.html.erb | 27 ++++++++++++++ .../stats/proposal_notifications.html.erb | 35 +++++++++++++++++++ app/views/admin/stats/show.html.erb | 11 ++++++ config/locales/admin.es.yml | 9 +++++ config/routes.rb | 5 ++- 6 files changed, 95 insertions(+), 1 deletion(-) create mode 100644 app/views/admin/stats/direct_messages.html.erb create mode 100644 app/views/admin/stats/proposal_notifications.html.erb diff --git a/app/controllers/admin/stats_controller.rb b/app/controllers/admin/stats_controller.rb index abfecdd7f..8cc5d712c 100644 --- a/app/controllers/admin/stats_controller.rb +++ b/app/controllers/admin/stats_controller.rb @@ -21,6 +21,15 @@ class Admin::StatsController < Admin::BaseController @user_ids_who_voted_proposals = ActsAsVotable::Vote.where(votable_type: 'Proposal').distinct.count(:voter_id) @user_ids_who_didnt_vote_proposals = @verified_users - @user_ids_who_voted_proposals @spending_proposals = SpendingProposal.count + end + def proposal_notifications + @proposal_notifications = ProposalNotification.all + @proposals_with_notifications = @proposal_notifications.pluck(:proposal_id).uniq + end + + def direct_messages + @direct_messages = DirectMessage.all + @users_who_have_sent_message = DirectMessage.pluck(:sender_id).uniq end end diff --git a/app/views/admin/stats/direct_messages.html.erb b/app/views/admin/stats/direct_messages.html.erb new file mode 100644 index 000000000..33c6ff517 --- /dev/null +++ b/app/views/admin/stats/direct_messages.html.erb @@ -0,0 +1,27 @@ +<%= render 'shared/back_link' %> + +

<%= t("admin.stats.direct_messages.title")%>

+ +
+
+
+ +
+
+

+ <%= t("admin.stats.direct_messages.total") %>
+ <%= @direct_messages.count %> +

+
+ +
+

+ <%= t("admin.stats.direct_messages.users_who_have_sent_message") %>
+ <%= @users_who_have_sent_message.count %> +

+
+
+ +
+
+
\ No newline at end of file diff --git a/app/views/admin/stats/proposal_notifications.html.erb b/app/views/admin/stats/proposal_notifications.html.erb new file mode 100644 index 000000000..106be14cf --- /dev/null +++ b/app/views/admin/stats/proposal_notifications.html.erb @@ -0,0 +1,35 @@ +<%= render 'shared/back_link' %> + +

<%= t("admin.stats.proposal_notifications.title")%>

+ +
+
+
+ +
+
+

+ <%= t("admin.stats.proposal_notifications.total") %>
+ <%= @proposal_notifications.count %> +

+
+ +
+

+ <%= t("admin.stats.proposal_notifications.proposals_with_notifications") %>
+ <%= @proposals_with_notifications.count %> +

+
+
+ +
+
+
+ +
+ <% @proposal_notifications.each do |notification| %> +

<%= link_to notification.proposal.title, proposal_path(notification.proposal) %>

+

<%= notification.title %>

+

<%= notification.body %>

+ <% end %> +
diff --git a/app/views/admin/stats/show.html.erb b/app/views/admin/stats/show.html.erb index 9a9ecbfa8..66d4cbf6c 100644 --- a/app/views/admin/stats/show.html.erb +++ b/app/views/admin/stats/show.html.erb @@ -6,6 +6,17 @@

<%= t "admin.stats.show.stats_title" %>

+
+
+ <%= link_to t("admin.stats.show.direct_messages"), + direct_messages_admin_stats_path %> +
+
+ <%= link_to t("admin.stats.show.proposal_notifications"), + proposal_notifications_admin_stats_path %> +
+
+

diff --git a/config/locales/admin.es.yml b/config/locales/admin.es.yml index eef5ce10e..62778a194 100644 --- a/config/locales/admin.es.yml +++ b/config/locales/admin.es.yml @@ -286,6 +286,15 @@ es: votes: Votos spending_proposals_title: Propuestas de inversión visits_title: Visitas + direct_messages: Mensajes directos + proposal_notifications: Notificaciones de propuestas + direct_messages: + title: Mensajes directos + users_who_have_sent_message: Usuarios que han enviado un mensaje privado + proposal_notifications: + title: Mensajes directos + total: Total + proposals_with_notifications: Propuestas con notificaciones tags: create: Crear Tema destroy: Eliminar Tema diff --git a/config/routes.rb b/config/routes.rb index d805683d3..ed2ee34e4 100644 --- a/config/routes.rb +++ b/config/routes.rb @@ -182,7 +182,10 @@ Rails.application.routes.draw do end resource :activity, controller: :activity, only: :show - resource :stats, only: :show + resource :stats, only: :show do + get :proposal_notifications, on: :collection + get :direct_messages, on: :collection + end namespace :api do resource :stats, only: :show From f9a2f5d5dc8fd3c9ecbf408854048dc32487d414 Mon Sep 17 00:00:00 2001 From: rgarcia Date: Thu, 16 Jun 2016 17:59:56 +0200 Subject: [PATCH 068/126] adds specs for stats --- .../admin/stats/direct_messages.html.erb | 8 ++- .../stats/proposal_notifications.html.erb | 16 +++-- config/locales/admin.en.yml | 9 +++ config/locales/admin.es.yml | 2 +- spec/factories.rb | 4 +- spec/features/admin/stats_spec.rb | 60 +++++++++++++++++++ 6 files changed, 89 insertions(+), 10 deletions(-) diff --git a/app/views/admin/stats/direct_messages.html.erb b/app/views/admin/stats/direct_messages.html.erb index 33c6ff517..17532f00f 100644 --- a/app/views/admin/stats/direct_messages.html.erb +++ b/app/views/admin/stats/direct_messages.html.erb @@ -10,14 +10,18 @@

<%= t("admin.stats.direct_messages.total") %>
- <%= @direct_messages.count %> + + <%= @direct_messages.count %> +

<%= t("admin.stats.direct_messages.users_who_have_sent_message") %>
- <%= @users_who_have_sent_message.count %> + + <%= @users_who_have_sent_message.count %> +

diff --git a/app/views/admin/stats/proposal_notifications.html.erb b/app/views/admin/stats/proposal_notifications.html.erb index 106be14cf..10f620ff6 100644 --- a/app/views/admin/stats/proposal_notifications.html.erb +++ b/app/views/admin/stats/proposal_notifications.html.erb @@ -10,14 +10,18 @@

<%= t("admin.stats.proposal_notifications.total") %>
- <%= @proposal_notifications.count %> + + <%= @proposal_notifications.count %> +

<%= t("admin.stats.proposal_notifications.proposals_with_notifications") %>
- <%= @proposals_with_notifications.count %> + + <%= @proposals_with_notifications.count %> +

@@ -28,8 +32,10 @@
<% @proposal_notifications.each do |notification| %> -

<%= link_to notification.proposal.title, proposal_path(notification.proposal) %>

-

<%= notification.title %>

-

<%= notification.body %>

+
+

<%= link_to notification.proposal.title, proposal_path(notification.proposal) %>

+

<%= notification.title %>

+

<%= notification.body %>

+
<% end %>
diff --git a/config/locales/admin.en.yml b/config/locales/admin.en.yml index ec3542c2c..088fd1078 100755 --- a/config/locales/admin.en.yml +++ b/config/locales/admin.en.yml @@ -288,6 +288,15 @@ en: votes: Total votes spending_proposals_title: Spending Proposals visits_title: Visits + direct_messages: Direct messages + proposal_notifications: Proposal notifications + direct_messages: + title: Direct messages + users_who_have_sent_message: Users that have sent a private message + proposal_notifications: + title: Proposal notifications + total: Total + proposals_with_notifications: Proposals with notifications tags: create: Create Topic destroy: Destroy Topic diff --git a/config/locales/admin.es.yml b/config/locales/admin.es.yml index 62778a194..b0b83f6ac 100644 --- a/config/locales/admin.es.yml +++ b/config/locales/admin.es.yml @@ -292,7 +292,7 @@ es: title: Mensajes directos users_who_have_sent_message: Usuarios que han enviado un mensaje privado proposal_notifications: - title: Mensajes directos + title: Notificaciones de propuestas total: Total proposals_with_notifications: Propuestas con notificaciones tags: diff --git a/spec/factories.rb b/spec/factories.rb index 4ead8ecac..209f45b28 100644 --- a/spec/factories.rb +++ b/spec/factories.rb @@ -327,8 +327,8 @@ FactoryGirl.define do end factory :proposal_notification do - title "Thank you for supporting my proposal" - body "Please let others know so we can make it happen" + sequence(:title) { |n| "Thank you for supporting my proposal #{n}" } + sequence(:body) { |n| "Please let others know so we can make it happen #{n}" } proposal end diff --git a/spec/features/admin/stats_spec.rb b/spec/features/admin/stats_spec.rb index 461f7ef32..7f343d1bc 100644 --- a/spec/features/admin/stats_spec.rb +++ b/spec/features/admin/stats_spec.rb @@ -70,4 +70,64 @@ feature 'Stats' do expect(page).to have_content "Level 2 User (1)" end + context "Proposal notifications" do + + scenario "Summary stats" do + proposal = create(:proposal) + + create(:proposal_notification, proposal: proposal) + create(:proposal_notification, proposal: proposal) + create(:proposal_notification) + + visit admin_stats_path + click_link "Proposal notifications" + + within("#proposal_notifications_count") do + expect(page).to have_content "3" + end + + within("#proposals_with_notifications_count") do + expect(page).to have_content "2" + end + end + + scenario "Index" do + 3.times { create(:proposal_notification) } + + visit admin_stats_path + click_link "Proposal notifications" + + expect(page).to have_css(".proposal_notification", count: 3) + + ProposalNotification.all.each do |proposal_notification| + expect(page).to have_content proposal_notification.title + expect(page).to have_content proposal_notification.body + end + end + + end + + context "Direct messages" do + + scenario "Summary stats" do + sender = create(:user, :level_two) + + create(:direct_message, sender: sender) + create(:direct_message, sender: sender) + create(:direct_message) + + visit admin_stats_path + click_link "Direct messages" + + within("#direct_messages_count") do + expect(page).to have_content "3" + end + + within("#users_who_have_sent_message_count") do + expect(page).to have_content "2" + end + end + + end + end From 352f3fa2f9ff21b5a17d9a1cda26505e3e100e4f Mon Sep 17 00:00:00 2001 From: Alberto Garcia Cabeza Date: Thu, 16 Jun 2016 18:07:13 +0200 Subject: [PATCH 069/126] Resolves conflicts and improves styles for stats --- .../admin/stats/direct_messages.html.erb | 38 +++++------- .../stats/proposal_notifications.html.erb | 60 +++++++++---------- app/views/admin/stats/show.html.erb | 21 ++++--- 3 files changed, 52 insertions(+), 67 deletions(-) diff --git a/app/views/admin/stats/direct_messages.html.erb b/app/views/admin/stats/direct_messages.html.erb index 17532f00f..432152db5 100644 --- a/app/views/admin/stats/direct_messages.html.erb +++ b/app/views/admin/stats/direct_messages.html.erb @@ -2,30 +2,20 @@

<%= t("admin.stats.direct_messages.title")%>

-
-
-
- -
-
-

- <%= t("admin.stats.direct_messages.total") %>
- - <%= @direct_messages.count %> - -

-
- -
-

- <%= t("admin.stats.direct_messages.users_who_have_sent_message") %>
- - <%= @users_who_have_sent_message.count %> - -

-
-
+
+
+
+

+ <%= t("admin.stats.direct_messages.total") %>
+ <%= @direct_messages.count %> +

+
+
+

+ <%= t("admin.stats.direct_messages.users_who_have_sent_message") %>
+ <%= @users_who_have_sent_message.count %> +

-
\ No newline at end of file +
diff --git a/app/views/admin/stats/proposal_notifications.html.erb b/app/views/admin/stats/proposal_notifications.html.erb index 10f620ff6..75b1c04f5 100644 --- a/app/views/admin/stats/proposal_notifications.html.erb +++ b/app/views/admin/stats/proposal_notifications.html.erb @@ -2,40 +2,36 @@

<%= t("admin.stats.proposal_notifications.title")%>

-
-
-
- -
-
-

- <%= t("admin.stats.proposal_notifications.total") %>
- - <%= @proposal_notifications.count %> - -

-
- -
-

- <%= t("admin.stats.proposal_notifications.proposals_with_notifications") %>
- - <%= @proposals_with_notifications.count %> - -

-
-
+
+
+
+

+ <%= t("admin.stats.proposal_notifications.total") %>
+ <%= @proposal_notifications.count %> +

+
+
+

+ <%= t("admin.stats.proposal_notifications.proposals_with_notifications") %>
+ <%= @proposals_with_notifications.count %> +

-
- <% @proposal_notifications.each do |notification| %> -
-

<%= link_to notification.proposal.title, proposal_path(notification.proposal) %>

-

<%= notification.title %>

-

<%= notification.body %>

-
- <% end %> -
+ + + <% @proposal_notifications.each do |notification| %> + + + + <% end %> + +
+

+ <%= notification.title %> + <%= link_to notification.proposal.title, proposal_path(notification.proposal) %> +

+

<%= notification.body %>

+
diff --git a/app/views/admin/stats/show.html.erb b/app/views/admin/stats/show.html.erb index 66d4cbf6c..ef17536c3 100644 --- a/app/views/admin/stats/show.html.erb +++ b/app/views/admin/stats/show.html.erb @@ -1,22 +1,21 @@ <% content_for :head do %> <%= javascript_include_tag "stat_graphs", 'data-turbolinks-track' => true %> <% end %> -
+
-

<%= t "admin.stats.show.stats_title" %>

+

<%= t "admin.stats.show.stats_title" %>

+ +
+ <%= link_to t("admin.stats.show.direct_messages"), + direct_messages_admin_stats_path, class: "button hollow" %> + <%= link_to t("admin.stats.show.proposal_notifications"), + proposal_notifications_admin_stats_path, class: "button hollow" %> -
-
- <%= link_to t("admin.stats.show.direct_messages"), - direct_messages_admin_stats_path %> -
-
- <%= link_to t("admin.stats.show.proposal_notifications"), - proposal_notifications_admin_stats_path %> -
+
+

From 32736110f9a3d3d0963ac373803d53d2b4b02348 Mon Sep 17 00:00:00 2001 From: rgarcia Date: Thu, 16 Jun 2016 18:20:14 +0200 Subject: [PATCH 070/126] adds missing translation --- config/locales/admin.en.yml | 1 + config/locales/admin.es.yml | 1 + 2 files changed, 2 insertions(+) diff --git a/config/locales/admin.en.yml b/config/locales/admin.en.yml index 088fd1078..2f73f64d8 100755 --- a/config/locales/admin.en.yml +++ b/config/locales/admin.en.yml @@ -292,6 +292,7 @@ en: proposal_notifications: Proposal notifications direct_messages: title: Direct messages + total: Total users_who_have_sent_message: Users that have sent a private message proposal_notifications: title: Proposal notifications diff --git a/config/locales/admin.es.yml b/config/locales/admin.es.yml index b0b83f6ac..5aada1ce1 100644 --- a/config/locales/admin.es.yml +++ b/config/locales/admin.es.yml @@ -290,6 +290,7 @@ es: proposal_notifications: Notificaciones de propuestas direct_messages: title: Mensajes directos + total: Total users_who_have_sent_message: Usuarios que han enviado un mensaje privado proposal_notifications: title: Notificaciones de propuestas From fc1ca8f8232c53165403a512be184afd065df6f0 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Juanjo=20Baz=C3=A1n?= Date: Thu, 16 Jun 2016 17:01:02 +0200 Subject: [PATCH 071/126] adds doc/locales folder with contributed locales adds fr & pt-br --- doc/locales/fr.yaml | 1686 +++++++++++++++++++++++++++++++++++++++ doc/locales/pt-br.yaml | 1703 ++++++++++++++++++++++++++++++++++++++++ 2 files changed, 3389 insertions(+) create mode 100644 doc/locales/fr.yaml create mode 100644 doc/locales/pt-br.yaml diff --git a/doc/locales/fr.yaml b/doc/locales/fr.yaml new file mode 100644 index 000000000..5ed967599 --- /dev/null +++ b/doc/locales/fr.yaml @@ -0,0 +1,1686 @@ +--- +fr: + account: + show: + change_credentials_link: Changer mes autorisations + email_on_comment_label: Me notifier par email quand quelqu'un commente mes propositions + ou mes débats + email_on_comment_reply_label: Me notifier par email quand quelqu'un répond à + mes commentaires + erase_account_link: Supprimer mon compte + finish_verification: Finir la vérification + notifications: Notifications + organization_name_label: Nom de l'organisation + organization_responsible_name_placeholder: Représentant de l'organisation ou + du collectif + personal: Détails personnels + phone_number_label: Téléphone + public_activity_label: Garder publique ma liste d'activités + save_changes_submit: Sauvegarder mes changements + subscription_to_website_newsletter_label: Recevoir par email la newsletter + title: Mon compte + username_label: Nom d'utilisateur + user_permission_debates: Participer aux débats + user_permission_info: Avec votre compte, vous pouvez... + user_permission_proposal: Créer de nouvelles propositions + user_permission_support_proposal: Soutenir des propositions + user_permission_title: Participation + user_permission_verify: Pour pouvoir réaliser toutes ces actions, merci de vérifier + votre compte + user_permission_verify_info: "* Uniquement pour les utilisateurs inscrits sur + le Recensement de Madrid" + user_permission_votes: Participer au vote final + verified_account: Compte vérifié + verify_my_account: Vérifier mon compte + activemodel: + attributes: + verification: + email: + recipient: Courriel + residence: + date_of_birth: Date de naissance + document_number: Numéro du document (en incluant les lettres) + document_type: Type de document + postal_code: Code postal + sms: + confirmation_code: Code de confirmation + phone: Téléphone + models: + verification: + residence: Résidence + sms: SMS + activerecord: + attributes: + comment: + body: Commentaire + user: Utilisateur + debate: + author: Auteur + description: Opinion + terms_of_service: Conditions d'utilisation + title: Titre + organization: + name: Nom de l'organisation + responsible_name: Personne responsable pour le groupe + proposal: + author: Auteur + description: Description + question: Question + terms_of_service: Conditions d'utilisation + title: Titre + user: + email: Courriel + official_level: Niveau officiel + official_position: Position officielle + password: Mot de passe + phone_number: Téléphone + username: Nom d'utilisateur + errors: + messages: + record_invalid: "Échec dans la validation : %{errors}" + restrict_dependent_destroy: + one: Impossible d'effacer cette donnée car une dépendance %{record} existe + many: Impossible d'effacer cette donnée car des dépendances %{record} existent + models: + debate: + attributes: + tag_list: + less_than_or_equal_to: Le nombre d'étiquettes doit être inférieur à + %{count} + proposal: + attributes: + tag_list: + less_than_or_equal_to: Le nombre d'étiquettes doit être inférieur à + %{count} + models: + activity: + one: activité + other: activités + administrator: + one: Administrateur + other: Administrateurs + comment: + one: Commentaire + other: Commentaires + debate: + one: Débat + other: Débats + moderator: + one: Modérateur + other: Modérateurs + organization: + one: Organisation + other: Organisations + proposal: + one: Proposition citoyenne + other: Propositions citoyennes + spending_proposal: + one: Dépense proposée + other: Dépenses proposées + tag: + one: "Étiquette" + other: "Étiquettes" + user: + one: Utilisateur + other: Utilisateurs + vote: + one: Vote + other: Votes + admin: + actions: + confirm: "Êtes-vous sũr(e) ?" + confirm_hide: Confirmer + hide: Cacher + hide_author: Cacher l'auteur + restore: Restaurer + activity: + show: + action: Action + actions: + block: Bloqué + hide: Caché + restore: Restauré + by: Modifié par + filter: Montrer + filters: + all: Tous + on_comments: Commentaires + on_debates: Débats + on_proposals: Propositions + on_users: Utilisateurs + title: Activité de modération + type: Type + comments: + index: + filter: Filtre + filters: + all: Tous + with_confirmed_hide: Confirmé + without_confirmed_hide: En attente + hidden_debate: Débat masqué + hidden_proposal: Proposition masquée + title: Commentaire masqué + dashboard: + index: + title: Administration + debates: + index: + filter: Filtre + filters: + all: Tous + with_confirmed_hide: Confirmé + without_confirmed_hide: En attente + title: Débats masqués + menu: + activity: Activité du modérateur + debate_topics: Sujets de débat + hidden_comments: Commentaires masqués + hidden_debates: Débats masqués + hidden_proposals: Propositions masquées + hidden_users: Utilisateurs masqués + incomplete_verifications: Vérifications incomplètes + moderators: Modérateurs + officials: Officiels + organizations: Organisations + settings: Paramètres + spending_proposals: Envoyer les propositions + stats: Statistiques + moderators: + index: + title: Modérateurs + moderator: + add: Ajouter + delete: Supprimer + search: + email_placeholder: Chercher par courriel + search: Chercher + user_not_found: Utilisateur non trouvé + officials: + edit: + destroy: Enlever le statut "Officiel" + title: 'Officiels : Modifier l''utilisateur' + flash: + official_destroyed: 'Détails sauvegardés: l''utilisateur n''est plus maintenant + une personne officielle' + official_updated: Détails de l'officiel + index: + title: Officiels + level_0: Non officiel + level_1: Niveau 1 + level_2: Niveau 2 + level_3: Niveau 3 + level_4: Niveau 4 + level_5: Niveau 5 + search: + edit_official: Editer un officiel + make_official: Rendre officiel + title: 'Propositions officielles : recherche utilisateur' + organizations: + index: + filter: Filtrer + filters: + all: Tout + pending: En attente + rejected: Rejeté + verified: Vérifié + reject: Rejeter + rejected: Rejeté + search: Chercher + search_placeholder: Nom, email ou numéro de téléphone + title: Organisations + verified: Vérifié + verify: Vérifier + search: + title: Chercher des organisations + proposals: + index: + filter: Filtrer + filters: + all: Tout + with_confirmed_hide: Confirmer + without_confirmed_hide: En attente + title: Propositions cachées + settings: + flash: + updated: Valeur mise a jour + index: + feature_flags: Fonctionnalités + features: + disable: Désactivé + disabled: Fonctionnalité désactivée + enable: Active + enabled: Fonctionnalité activée + title: Paramètres + update_setting: Mise a jour + shared: + proposal_search: + button: Chercher + placeholder: Rechercher des propositions par titre, description ou question + user_search: + button: Chercher + placeholder: Rechercher un utilisateur par nom ou mail + spending_proposals: + index: + title: Propositions de dépenses pour le budget participatif + show: + by: Envoyé par + geozone: Champ d'application + stats: + show: + stats_title: Statistiques + summary: + comments: Commentaires + comment_votes: Commenter les votes + debates: Débats + debate_votes: Débattre + proposals: Propositions + proposal_votes: Proposition de votes + unverified_users: Utilisateurs non vérifiés + user_level_three: Utilisateurs de niveau 3 + user_level_two: Utilisateurs de niveau 2 + users: Total des utilisateurs + verified_users: Utilisateurs vérifiés + visits: Visites + votes: Total de votes + tags: + create: Créer un sujet + destroy: Supprimer un sujet + index: + add_tag: Ajouter un nouveau sujet de débat + title: Sujets de débat + mark_as_featured: Proposer un sujet après création d'un débat + name: + placeholder: "Écrire le nom du sujet" + update: Mettre à jour le sujet + users: + index: + filter: Filtrer + filters: + all: Tout + with_confirmed_hide: Confirmé + without_confirmed_hide: En attente + title: Utilisateurs cachés + show: + email: 'Mail :' + hidden_at: 'Caché à :' + registered_at: 'Enregistré à :' + title: Activité de l'utilisateur %{user} + verifications: + index: + phone_not_given: Téléphone non renseigné + sms_code_not_confirmed: Code SMS non confirmé + title: Vérifications incomplètes + application: + close: Fermer + menu: Menu + ckeditor: + buttons: + cancel: Fermer + delete: Supprimer + next: Suivant + upload: Upload + confirm_delete: Supprimer le fichier ? + page_title: Gestionnaire de fichiers CKEditor + comments: + comment: + admin: Administrateur + author: Auteur + deleted: Ce commentaire a été supprimé + moderator: Modérateur + responses: + one: 1 réponse + other: "%{count} réponses" + zero: Aucune réponses + user_deleted: Utilisateur supprimé + votes: + one: 1 vote + other: "%{count} votes" + zero: Aucun votes + form: + comment_as_admin: Commenter en tant qu'administrateur + comment_as_moderator: Commenter en tant que modérateur + leave_comment: Laisser un commentaire + orders: + most_voted: Le plus voté + newest: Plus récent en premier + oldest: Plus ancien en premier + select_order: Trier par + show: + return_to_commentable: Revenir à + comments_helper: + comment_button: Publier un commentaire + comment_link: Commentaire + reply_button: Publier la réponse + reply_link: Répondre + date: + abbr_day_names: + - Dim + - Lun + - Mar + - Mer + - Jeu + - Ven + - Sam + abbr_month_names: + - + - Jan + - Fév + - Mar + - Avr + - Mai + - Jui + - Jui + - Aoû + - Sep + - Oct + - Nov + - Déc + day_names: + - Lundi + - Mardi + - Mercredi + - Jeudi + - Vendredi + - Samedi + - Dimanche + formats: + default: "%j-%m-%A" + long: "%B %d, %Y" + short: "%b %d" + month_names: + - + - Janvier + - Février + - Mars + - Avril + - Mai + - Juin + - Juillet + - Août + - Septembre + - Octobre + - Novembre + - Décembre + order: + - Jour + - Mois + - Année + datetime: + distance_in_words: + about_x_hours: + one: "à peu près 1 heure" + other: "à peu près %{count} heures" + about_x_months: + one: "à peu près 1 mois" + other: "à peu près %{count} mois" + about_x_years: + one: "à peu près 1 an" + other: "à peu près %{count} années" + almost_x_years: + one: presque 1 an + other: presque %{count} années + half_a_minute: 30 secondes + less_than_x_minutes: + one: moins d'une minute + other: environ %{count} minutes + less_than_x_seconds: + one: moins d'une seconde + other: environ %{count} secondes + over_x_years: + one: plus d'un an + other: plus de %{count} années + x_days: + one: 1 jour + other: "%{count} jours" + x_minutes: + one: 1 minute + other: "%{count} minutes" + x_months: + one: 1 mois + other: "%{count} mois" + x_seconds: + one: 1 seconde + other: "%{count} secondes" + prompts: + day: Jour + hour: Heure + minute: Minute + month: Mois + second: Secondes + year: Années + debates: + create: + form: + submit_button: Commencer un débat + debate: + comments: + one: 1 commentaire + other: "%{count} commentaires" + zero: Aucun commentaires + debate: Débat + votes: + one: 1 vote + other: "%{count} votes" + zero: Aucun vote + edit: + editing: Modifier le débat + form: + submit_button: Enregistrer les changements + show_link: Voir le débat + form: + debate_text: Texte initial du debat + debate_title: Titre du débat + tags_instructions: "Étiquetter ce débat" + tags_label: Sujets + tags_placeholder: Entrez les étiquettes que vous voulez utiliser, séparées par + des virgules (',') + index: + featured_debates: Présenté + filter_topic: + one: avec thème '%{topic}' + other: avec thème '%{topic}' + orders: + confidence_score: Mieux noté + created_at: plus récent + hot_score: Plus active + most_commented: Plus commentée + relevance: Pertinence + search_form: + button: Rechercher + placeholder: Rechercher des débats... + title: Rechercher + search_results: + one: " contenant le mot '%{search_term}'" + other: " contenant le mot '%{search_term}'" + select_order: Trier par + start_debate: Commencer un débat + title: Débats + new: + form: + submit_button: Commencer un débat + info: Si vous souhaitez faire une proposition, vous êtez dans la mauvaise section, + entrez %{info_link}. + info_link: Créer une nouvelles proposition + more_info: Plus d'informations + recommendation_four: Profitez de cet espace et des voix qui le remplissent. + Il vous appartient aussi. + recommendation_one: Ne pas utiliser de lettres capitales pour le titre du débat + ou pour des phrases entières. Sur internet, c'est considéré comme crier. Et + personne n'aime se faire crier dessus. + recommendations_title: Recommandations pour créer un débat + recommendation_three: La critique sans pitié est la bienvenue. Ceci est un espace + pour la reflexion. Mais nous recommandons de conserver de l'élégance et de + l'intelligence. Le monde est un endroit meilleur avec ces qualités. + recommendation_two: Tout débat ou commentaire suggérant des actions illégales + sera supprimé, de même que ceux ayant pour but de saboter l'espace de débat. + Tout le reste est autorisé. + start_new: Commencer un débat + show: + author_deleted: Utilisateur supprimé + comments: + one: 1 commentaire + other: "%{count} commentaires" + zero: Aucun commentaire + comments_title: Commentaires + edit_debate_link: Modifier + flag: Ce débat a été étiquetté comme inapproprié par plusieurs utilisateurs + login_to_comment: Vous devez %{signin} ou %{signup} pour laisser un commentaire. + share: Partager + update: + form: + submit_button: Sauvegarder les changements + devise: + confirmations: + confirmed: Votre compte a été confirmé + send_instructions: Dans quelques minutes, vous allez recevoir un mail contenant + les instructions permettant de réinitialiser votre mot de passe + send_paranoid_instructions: Si votre mail est dans notre base de données, vous + allez recevoir un mail contenant les instructions permettant de réinitialiser + votre mot de passe dans quelques minutes. + failure: + already_authenticated: vous êtes déjà enregistré + inactive: Votre compte n'a pas encore été activé + invalid: "%{authentication_keys} ou mot de passe" + last_attempt: Vous pouvez encore essayer une fois avant que votre compte soit + bloqué. + locked: Votre compte a été bloqué + not_found_in_database: Clés %{authentication_keys} ou mot de passe. + timeout: Votre session a expiré. Merci de vous connecter de nouveau pour continuer. + unauthenticated: Vous devez vous connecter ou vous enregistrer pour continuer. + unconfirmed: Pour continuer, merci de cliquer sur le lien de confirmation que + nous vous avons envoyé par courriel + mailer: + confirmation_instructions: + subject: Instructions de confirmation + password_change: + subject: Mot de passe modifié + reset_password_instructions: + subject: Instructions pour réinitialiser votre mot de passe + unlock_instructions: + subject: Débloquer les instructions + omniauth_callbacks: + failure: Il n'a pas été possible de vous autoriser comme %{kind} parce que "%{reason}". + success: Identification réussie %{kind}. + passwords: + no_token: Vous ne pouvez pas accéder à cette page sauf avec un lien de réinitialisation + de mot de passe. Si vous avez accéder avec un lien, merci de vérifier que + votre URL est complète. + send_instructions: Dans quelques minutes vous recevrez un email contenant les + instructions pour réinitialiser votre mot de passe. + send_paranoid_instructions: Si votre adresse email est dans la base de données, + dans quelques minutes vous recevrez un lien pour réinitialiser votre mot de + passe. + updated: Votre mot de passe a été changé. Authentification réussie. + updated_not_active: Votre mot de passe a été changé + registrations: + destroyed: Au revoir ! Votre compte est supprimé. Nous espérons vous revoir + bientôt. En accord avec votre requête, les informations personnelles enregistrées + pour votre compte d'utilisateur sur le plateforme decide.madrid.es et le formulaire + du fichier "Gestion des processus participatifs" sous la responsabilité de + la Direction Générale de la Participation Citoyenne ont été supprimées selon + les termes de l'article 16 Ley Orgánica 15/1999 de Protección de Datos de + Carácter Personal et l'Article 31 de son Reglamento de desarrollo (RD 1720/2007). + signed_up: Bienvenue ! Vous avez été authentifié + signed_up_but_inactive: Votre enregistrement à été réussi, mais vous ne pouvez + pas vous connecter car votre compte n'a pas été activé. + signed_up_but_locked: Votre enregistrement a réussi, mais vous ne pouvez pas + vous connectez car votre compte est bloqué. + signed_up_but_unconfirmed: Un message vous a été envoyé contenant un lien de + vérification de votre adresse. Veuillez cliquez sur le lien pour activer votre + compte + updated: La mise à jour de votre compte à été réussie. + update_needs_confirmation: Votre compte à été mis à jour avec succès; Cependant + nous avons besoin de vérifier votre email. Veuillez verifier votre amil et + cliquer sur le lien pour compléter la confirmation de votre nouvelle adresse + mail. + sessions: + already_signed_out: Vous êtes déconnecté avec succès. + signed_in: Vous êtes connecté avec succès. + signed_out: Vous êtes déconnecté avec succès. + unlocks: + send_instructions: Dans quelques minutes, vous recevrez un courriel contenant + les instructions pour débloquer votre compte. + send_paranoid_instructions: Si vous avez un compte, dans quelques minutes vous + recevrez un courriel contenant les instructions permettant de débloquer votre + compte. + unlocked: Votre compte à été débloqué. Veuillez vous connecter pour continuer + devise_views: + confirmations: + new: + email_label: Courriel + submit: Renvoyer les instructions + title: Renvoi des instructions de confirmations + show: + instructions_html: Confirmer votre compte avec votre courriel %{email} + new_password_confirmation_label: Répeter votre mot de passe accès + new_password_label: Nouveau mot de passe accès + please_set_password: Veuillez choisir un nouveau mot de passe( il vous permettra + de vous connecter avec le courriel au dessus) + submit: Confirmer + title: Confirmer mon compte + mailer: + confirmation_instructions: + confirm_link: Confirmer votre compte + text: 'Vous pouvez confirmer votre compte courriel par le lien suivant:' + title: Bienvenue sur le portail de la mairie Gouvernement Ouvertl de la ville + de Madrid. + welcome: Bienvenue + reset_password_instructions: + change_link: Changer mon mot de passe + hello: Bonjour + ignore_text: Si vous ne souhaitez pas un changement de votre mot de passe, + vous pouvez ignorer ce courriel + info_text: Votre mot de passe ne sera pas changé, à moins que vous accéder + au lien et l'éditez. + text: 'Nous avons reçu une requête pour changer votre mot de passe. Vous pouvez + changer celui-ci avec le lien :' + title: Changez votre mot de passe + unlock_instructions: + hello: Bonjour + info_text: Votre compte à été bloqué suite à un nombre excessif de tentative + échouées de connexion. + instructions_text: 'Veuillez cliquer sur ce lien pour débloquer votre compte:' + title: Votre compte à été bloqué + unlock_link: Débloquer mon compte + menu: + login_items: + login: Connexion + logout: Déconnexion + signup: S'inscrire + organizations: + registrations: + new: + email_label: Courriel + organization_name_label: Nom d'organisation + password_confirmation_label: Confirmer votre mot de passe + password_label: Mot de passe + phone_number_label: Numéro de téléphone + responsible_name_label: Nom complet de la personne responsable pour le collectif + responsible_name_note: Ce serait la personne représentant l'association/collectif + au nom duquel les propositions sont présentées + submit: S'enregistrer + title: S'enregistrer comme organisation ou collectif + success: + back_to_index: Je comprends; retour sur la page principale + instructions_1_html: "Nous vous contacterons bientôt pour vérifier + que vous représentez ce collectif." + instructions_2_html: Pendant que votre email est vérifié, nous vous + avons envoyé un lien pour confirmer votre compte. + instructions_3_html: Une fois confirmé, vous pouvez commencer à participer + comme un collectif non verifié. + thank_you_html: Merçi pour l'enregistrement du collectif sur notre site. + Il est maintenantVérification en attente. + title: Enregistrement de l'organisation / collectif + passwords: + edit: + change_submit: Changer mon mot de passe + password_confirmation_label: Confirmer votre nouveau mot de passe + password_label: Nouveau mot de passe + title: Changer votre mot de passe + new: + email_label: Courriel + send_submit: Envoyer instructions + title: Mot de passe oublié + sessions: + new: + email_label: Courriel + password_label: Mot de passe + remember_me: Se souvenir de moi + submit: Entrer + title: Se connecter + shared: + links: + login: Entrer + new_confirmation: Vous n'avez pas reçu les instructions pour activer votre + compte ? + new_password: Mot de passe oublié + new_unlock: Vous n'avez pas reçu vos instructions de déblocage ? + signin_with_provider: Se connecter avec %{provider} + signup: Pas encore inscrit(e) ? %{signup_link} + signup_link: S'inscrire + unlocks: + new: + email_label: Courriel + submit: Renvoi des instructions de déblocage + title: Renvoi des instruction de déblocage + users: + registrations: + delete_form: + erase_reason_label: Raison + info: Cette action ne peut pas être annulée. Veuillez être sur que c'est + ce que vous souhaitez. + info_reason: Si vous le souhaitez, laissez nous une raison (facultatif) + submit: Supprimer mon compte + title: Supprimer le compte + edit: + current_password_label: Mot de passe courant + edit: Editer + email_label: Courriel + leave_blank: Laisser en blanc si vous souhaitez rien modifier + need_current: Vous devez avoir votre mot de passe actuel pour confirmer + les modifications + password_confirmation_label: Confirmer votre nouveau mot de passe + password_label: Nouveau mot de passe + update_submit: Mis à jour + waiting_for: 'En attente de confimation de:' + new: + cancel: Annuler votre inscription + email_label: Courriel + organization_signup: Représentez-vous une organisation ou un collectif ? + %{signup_link} + organization_signup_link: S'inscrire ici + password_confirmation_label: Confirmer votre mot de passe + password_label: Mot de passe + submit: S'enregistrer + terms: En vous enregistrant vous acceptez %{terms} + terms_link: Termes et conditions d'usages + title: S'enregistrer + username_is_available: Nomt d'utilisateur disponible + username_is_not_available: Nom déja utilisé + username_label: Nom utilisateur + username_note: Nom qui doit apparaître près de vos posts + success: + back_to_index: Je comprends; Aller à la page principale + instructions_1_html: Veuillez vérifier votre email - nous vous avons + envoyé un lien pour confirmer votre compte. + instructions_2_html: Une fois confirmé, vous pouvez commencer à participer + thank_you_html: Merçi pour votre enregistrement sur notre site. Maintenant + vous devez confirmer votre addresse email. + title: Modifier votre courriel + errors: + format: "%{message} %{attribute}" + messages: + accepted: Doit être accepté + already_confirmed: Vous avez déjà été vérifié; veuillez vous connecter + blank: ne peut pas être blanc + confirmation: "%{attribute} ne correspond pas." + confirmation_period_expired: Vous avez besoin d'être vérifé avant %{period} + ; merci de recommencer. + empty: ne peut pas être vide + equal_to: ne doit pas être égal à %{count} + even: doit être pair + exclusion: is réservé + expired: a expiré. Merci de réessayer + greater_than: doit être supérieur à %{count} + greater_than_or_equal_to: doit être supérieur ou égal à %{count} + inclusion: n'est pas inclus dans la liste + invalid: est invalide + less_than: doit être inférieur à %{count} + less_than_or_equal_to: doit être inférieur ou égal à %{count} + not_an_integer: doit être un intégré + not_a_number: n'est pas un nombre + not_found: introuvé. + not_locked: n'est pas protégé. + not_saved: + one: '1 erreur a empêché cette %{resource} d''être sauvegardée:' + other: "%{count} erreurs ont empêché cette %{resource} d'être sauvegardée:" + odd: doit être impair + other_than: doit être différent de %{count} + present: doit être vide + taken: est déjà utilisé + too_long: + one: est trop long (1 caractère maximum) + other: est trop long (%{count} caractères maximums autorisés) + too_short: + one: est trop court (1 caractère minimum) + other: is too short (minimum is %{count} characters) + user_not_found: Utilisateur introuvable + wrong_length: + one: taille incorrecte (devrait être 1 seul caractère) + other: taille incorrecte (devrait être %{count} caractères) + flash: + actions: + create: + debate: Débat créé avec succès ! + notice: "%{resource_name} créé avec succès !" + proposal: Proposition créee avec succès ! + spending_proposal: Proposition de dépense créee avec succès ! + destroy: + alert: "%{resource_name} n'a pas pu être enlevé." + notice: "%{resource_name} enlevé avec succès !" + save_changes: + notice: Changements sauvegardés + update: + debate: Débat actualisé avec succès ! + notice: "%{resource_name} actualisé avec succès !" + proposal: Proposition actualisée avec succès + form: + accept_terms: J'accepte le %{policy} et les %{conditions} + conditions: Conditions légales + debate: Débat + error: erreur + errors: erreurs + not_saved: "%{resource} empêché d'être sauvegardé" + policy: Vie privée + proposal: Proposition + spending_proposal: Proposition de dépense + user: Compte + geozones: + none: Toute la ville + helpers: + page_entries_info: + entry: + one: Entrée + other: Entrées + zero: Entrées + more_pages: + display_entries: Affichage %{first} - %{last} de %{total} + %{entry_name} + one_page: + display_entries: + zero: "%{entry_name} n'a pas pu être trouvé." + one: Il y a1 %{entry_name} + other: Il y a %{count} %{entry_name} + select: + prompt: Merci de sélectionner + submit: + create: Créer %{model} + submit: Sauvegarder %{model} + update: Actualiser %{model} + layouts: + application: + chrome: Google Chrome + firefox: Firefox + ie: Vous utilisez Internet Explorer. Pour une navigation plus sûre, %{chrome} + ou %{firefox} sont recommandés. + ie_title: Ce site internet n'est pas affiché de manière optimale par votre navigateur. + footer: + accessibility: Accessibilité + conditions: Conditions d'utilisation + consul: Application Consul + consul_url: https://github.com/consul/consul + contact_us: Pour l'assistance technique entrer + copyright: Mairie de Madrid, %{year} + description: Ce portail utiliser %{consul} qui est %{open_source}. De Madrid + ouvert sur le monde. + faq: assistance technique + more_info: Plus d'information + open_data_text: Tout les détails de la Mairie sont vôtre pour accès + open_data_title: Open data + open_source: logiciel libre + open_source_url: http://www.gnu.org/licenses/agpl-3.0.html + participation_text: Modelez la ville de Madrid dans laquelle vous souhaitez + vivre + participation_title: Participation + privacy: Vie privée + transparency_text: Trouver tout à propos de la mairie de Madrid + transparency_title: Transparence + transparency_url: https://transparencia.madrid.es + header: + administration: Administration + debates: Débats + external_link_blog: Blog + external_link_opendata: Open data + external_link_opendata_url: http://datos.madrid.es + external_link_transparency: Transparence + external_link_transparency_url: https://transparencia.madrid.es + locale: 'Langue :' + logo: Madrid + moderation: Modération + more_information: Plus d'information + my_account_link: Mon compte + my_activity_link: Mon activité + new_notifications: + one: Vous avez une nouvelle notification + other: Vous avez %{count} nouvelles notifications + no_notifications: Vous n'avez pas de nouvelles notifications + open: ouvert + open_city_slogan_html: Il y a des villes gouvernées directement par leurs habitants + qui discutent des sujets dont il se sentent concernées, proposent des idées + pour améliorer leurs vies et décider lesquelles seront mises en place. Madrid + est déjà une de ces villes. + open_city_title: Aimez la ville, et elle deviendra la ville que vous aimez + open_data: Open data + open_gov: Gouvernement ouvert + processes: Processus ouverts + proposals: Propositions + spending_proposals: Propositions de dépense + locale: Français + mailers: + comment: + hi: Bonjour + new_comment_by_html: Il y a un nouveau commentaire de %{commenter} + subject: Quelqu'un a commenté votre %{commentable} + title: Nouveau commentaire + config: + manage_email_subscriptions: Pour ne plus recevoir ces emails, changer vos options + dans + email_verification: + click_here_to_verify: ce lien + instructions_2_html: Cet email va vérifier votre compte avec %{document_type} + %{document_number}. Si ce compte ne vous appartient pas veuillez ne pas + cliquer sur le lien et ignorer cet email. + instructions_html: Pour confirmer la vérification de votre compte sur le Portail + Gouvernement ouvert de la Mairie de Madrid, vous devez cliquer %{verification_link}. + subject: Confirmer votre email + thanks: Merci beaucoup + title: Confirmer votre compte en utilisant le lien suivant + reply: + hi: Bonjour + new_reply_by_html: Il y a une nouvelle réponse de %{commenter} sur votre + commentaire à propos de + subject: Quelqu'un a répondu à votre commentaire + title: Nouvelle réponse à votre commentaire + management: + account_info: + change_user: Changer d'utilisateur + document_number_label: Numéro de document + document_type_label: Type de document + email_label: 'Courriel:' + identified_label: 'Identifié comme :' + username_label: 'Nom d''utilisateur :' + check: Vérifier + dashboard: + index: + title: Gestion + document_number: Numéro de document + document_type_label: Type de document + document_verifications: + already_verified: Cet utilisateur est déjà vérifié. + has_no_account_html: Pour créer un compte, vous pouvez aller sur %{link} et + cliquer sur 'S'enregistrer' dans le coin supérieur gauche de votre + écran. + in_census_has_following_permissions: 'Cet utilisateur peut participer dans la + plateforme avec les autorisations suivantes :' + not_in_census: Ce document n'est pas enregistré à Madrid. + not_in_census_info: 'Les personnes non-enregistrées dans le recensement peuvent + participer dans la plateforme avec les autorisations suivantes :' + please_check_account_data: Merci de vérifier que vos informations ci-dessus + sont correctes. + title: Gestion d'utilisateur + under_age: Vous devez avoir plus de 16 ans pour vérifier votre compte. + verify: Vérifier + email_label: Courriel + email_verifications: + already_verified: Ce compte d'utilisateur est déjà vérifié. + choose_options: 'Merci de choisir l''une des options suivantes :' + document_found_in_census: Ce document a été trouvé dans le Recensement, mais + aucun compte d'utilisateur a été associé. + document_mismatch: 'Cet email appartient à l''utilisateur qui a déjà l''identifiant + suivant associé: %{document_number}(%{document_type})' + email_placeholder: Lui envoyer un courriel pour créer son compte + email_sent_instructions: Afin de vérifier totalement cet utilisateur, l'utilisateur + doit cliquer sur un lien envoyé à son adresse courriel mentionnée au-dessus. + Cette étape est obligatoire afin de confirmer que l'adresse lui appartient + bien. + if_existing_account: Si cette personne a déjà un compte d'utilisateur créé dans + le site, + if_no_existing_account: Si cette personne n'a pas encore créé son compte + introduce_email: Merci de donner le courriel utilisé pour ce compte + send_email: Envoyer un email de vérification + menu: + create_proposal: Créer une proposition + create_spending_proposal: Créer une proposition de dépense + print_proposals: Imprimer les propositions + support_proposals: Soutenir les propositions + title: Gestion + users: Utilisateurs + permissions: + create_proposals: Créer des propositions + debates: Participer aux débats + support_proposals: Soutenir des propositions + vote_proposals: Voter pour des propositions + print_info: Imprimer cet info + print: + proposals_title: 'Propositions :' + proposals: + alert: + unverified_user: L'utilisateur n'est pas vérifié + create_proposal: Créer une proposition + print: + print_button: Imprimer + sessions: + signed_out: Déconnexion réussie + signed_out_managed_user: Déconnexion de l'utilisateur réussie + spending_proposals: + alert: + unverified_user: L'utilisateur n'est pas vérifié + create: Créer une proposition de dépense + username_label: Nom d'utilisateur + users: + create_user: Créer un nouveau compte + create_user_info: 'Nous allons créer avec les donnés suivantes :' + create_user_submit: Créer l'utilisateur + create_user_success_html: Nous avons envoyé un courriel à l'adresse %{email} + afin de confirmer que l'adresse lui appartient bien. L'utilisateur doit cliquer + sur un lien envoyé à cette adresse. Puis il faudra créer un mot de pass + map: + proposal_for_district: Commencer une proposition pour votre secteur + select_district: Portée de l'opération + start_proposal: Créer une proposition + title: Secteurs + moderation: + comments: + index: + block_authors: Bloquer les auteurs + confirm: "Êtes-vous certain(e) ?" + filter: Filtre + filters: + all: Tous + pending_flag_review: En attente + with_ignored_flag: Marqué comme vu + headers: + comment: Commentaire + moderate: Modérer + hide_comments: Cacher commentaires + ignore_flags: Marquer comme vu + order: Ordonner + orders: + flags: Le plus signalé + newest: Le plus récent + title: Commentaires + dashboard: + index: + title: Modération + debates: + index: + block_authors: Bloquer les auteurs + confirm: "Êtes-vous certain(e) ?" + filter: Filtre + filters: + all: Tous + pending_flag_review: En attente + with_ignored_flag: Marqué comme vu + headers: + debate: Débattre + moderate: Modérer + hide_debates: Cacher les débats + ignore_flags: Marquer comme vu + order: Ordonner + orders: + created_at: Les plus récents + flags: Les plus signalés + title: Débats + menu: + flagged_comments: Commentaires + flagged_debates: Débats + proposals: Propositions + users: Bloquer les utilisateurs + proposals: + index: + block_authors: Bloquer les auteurs + confirm: "Êtes-vous certain(e) ?" + filter: Filtre + filters: + all: Tous + pending_flag_review: Modération en attente + with_ignored_flag: Marquer comme vu + headers: + moderate: Modérere + proposal: Proposition + hide_proposals: Cacher les propositions + ignore_flags: Marquer comme vu + order: Ordonner par + orders: + created_at: Les plus récentes + flags: Les plus signalées + title: Propositions + users: + index: + hidden: Bloqué + hide: Bloquer + search: Chercher + search_placeholder: Courrier ou nom d'utilisateur + title: Bloquer les utilisateurs + notice_hide: Utilisateur bloqué. Toutes les contributions (débats et commentaires) + ont été cachées. + notifications: + index: + comments_on: + one: personne a commenté + other: Il ya %{count} nouveaux commentaires + empty_notifications: Vous n'avez pas de nouvelles notifications + mark_all_as_read: Marquer comme tout lu + replies_to: + one: Quelqu'un à répondu à votre commentaire + other: Il y a %{count} nouvelles réponses à votre commentaire + title: Notifications + number: + currency: + format: + delimiter: "," + format: "%u%n" + precision: 2 + separator: "." + significant: false + strip_insignificant_zeros: false + unit: "$" + format: + delimiter: "," + precision: 3 + separator: "." + significant: false + strip_insignificant_zeros: false + human: + decimal_units: + format: "%n %u" + units: + billion: Milliards + million: Million + quadrillion: Milliard de milliards + thousand: Mille + trillion: Millions de milliards + unit: vide + format: + delimiter: vide + precision: 3 + significant: true + strip_insignificant_zeros: true + storage_units: + format: "%n %u" + units: + byte: + one: Bits + other: Bits + gb: GB + kb: KB + mb: MB + tb: TB + percentage: + format: + delimiter: vide + format: "%n%" + precision: + format: + delimiter: vide + omniauth: + facebook: + sign_in: S'enregistrer avec Facebook + sign_up: S'enregistrer avec Facebook + finish_signup: + title: Données supplémentaires + google_oauth2: + sign_in: S'enregistrer avec Google + sign_up: S'enregistrer avec Google + twitter: + sign_in: S'enregistrer avec Twitter + sign_up: S'enregistrer avec Twitter + pages: + census_terms: "Pour confirmer votre compte, vous devez avoir plus de 16 ans et + résider à Madrid. Après avoir rempli les informations déjà demandées, la Direction + Générale de la Participation Civile vérifiera dans deux fichiers, le Recensement + municipal des Habitants (dont la responsabilité dépend de la Direction Générale + des Statistiques) et les Services de soutien aux citoyens (dont la responsabilité + dépend de la Direction Générale de la Qualité et des Services citoyens).\r\n\r\nEn + acceptant le processus de vérification, vous consentez aussi à la vérification + de vos informations, ainsi que les méthodes de contact des fichiers mentionnés. + Les informations fournies seront acquises et collectées par la Direction Générale + de la Participation Civile dans le fichier Gestion des Activités participatives\" + mentionnées dans les conditions d'utilisation de ce portail." + conditions: Conditions d'utilisation + general_terms: Conditions d'utilisation + more_information: + description: + faq: Questions fréquentes sur les problèmes techniques + how_it_works: Découvrez tout ce qui est possible de faire avec ce site + how_to_use: "À utiliser librement ou à améliorer... c'est un logiciel libre" + participation: Participation citoyenne, tranparence et gouvernement ouvert + participation_facts: Pour perdre votre crainte + participation_world: Système de participation citoyenne qui existent dans + le monde + proposals_info: Créer vos propres propositions + signature_sheet: Page collectant les signatures de soutien + spending_proposals_info: Créer vos propres propositions de dépense + how_it_works: + i: Participation + i1: Zone des débats + i2: Zone des propositions + text: "Le nouveau Portail Gouvernement ouvert est divisée en trois parties + : Participation, Transparence et Open Data (vous pouvez voir les liens dans + la partie supérieure à droite).\r\n>**I. Participation:** Dans cette partie, + nous pouvons décider quelle est la ville que nous souhaitons (en utilisant + des propositions citoyennes, des zones de débats, des budgets participatifs, + une législation collaborative et d'autres démarches que nous allons mettre + en place).\r\n**II. Transparence:** Dans cette partie, l'information à propos + de la manière dont Madrid est gérée quotidiennement : nom, position, salaire, + contrats, agenda,... de la personne en responsabilité. C'est aussi l'endroit + où vous pouvez exercer votre droit d'accès à l'information, en pouvant demander + n'importe quelle information à propos de la Ville de Madrid facilement et + rapidement.\r\n**III. Open data:** Dans cette partie les bases de données + de la Mairie sont postées directement, sans avoir à demander. On peut aussi + demander la publication de nouvelles bases de données." + how_to_use: + text: "Utilisez cet outil dans votre collectivité ou aidez-nous àl'améliorer, + c'est un logiciel libre.\r\n\r\nCe portail de gouvernement ouvert utilise + cette [application Consul ](https://github.com/ayuntamientomadrid 'consul + github') qui est un logiciel libre, avec une [license AGPLv3](http://www.gnu.org/licenses/agpl-3.0.html + 'AGPLv3 gnu' ), ce qui signifie en fait que n'importe qui peut utiliser + le code librement, le copier, l'étudier en détail, le modifier et le redistribuer + au monde entier avec les modifications qu'il souhaite (autorisant les autres + à faire la même chose). Parce que nous pensons que la culture est meilleure + et plus riche quand c'est libérée.\r\n\r\nNon seulement vous pouvez utiliser + ce portail pour votre propre collectivité, mais vous serez aussi aidé par + la Mairie de Madrid autant que possible pour le faire. Si vous êtes intéressé, + n'hésitez pas à nous contacter : ag.gobiernoabierto@madrid.es\r\n\r\nSi + vous êtes développeur, vous pouvez voir le code et nous aider à l'améliorer + sur [Consul app](https://github.com/ayuntamientomadrid 'consul github ' + )." + titles: + faq: Solution pour les problèmes techniques (FAQ) + how_it_works: Comment marche le portail Gouvernement ouvert ? + how_to_use: Utiliser dans votre collectivité + participation: Participation et transparence à Madrid - les nouvelles à venir + participation_facts: Faits à propos de la participation citoyenne et de la + démocratie directe + participation_world: Participation citoyenne directe dans le monde + proposals_info: Comment marche les propositions citoyennes ? + signature_sheet: Feuille de signature + spending_proposals_info: Comment marche le budget participatif ? + opendata: + go_old: Visiter le portail Open Data + slogan_html: Nous travaillons sur le nouveau portail Open Data de la Ville de + Madrid, tandis que vous pouvez toujours visiter la version actuelle. + title: Open Data + privacy: Vie privée + processes: + back: Revenir + index: + process_1_button: Plus d'informations + process_1_description: Madrid veut lancer un système de transparence publique + le plus avancé dans le monde et vous avons besoin de votre aide. + process_1_title: Loi de transparence + process_2_button: Plus d'informations + process_2_description: Nous comptons sur vous pour décider comment vous voyez + ce nouvel espace dans la ville. + process_2_title: Remodelage de la Plaza España + process_1: + button: Ordonnance + comment: Laissez vos commentaires + text: "Jusqu'au 31 Janvier vous pouvez %{comment} sur le projet d'ordonnace + de Transparence de la ville de Madrid ou envoyer un mail à transparence@madrid.es.\r\n\r\nVous + pouvez voir maintenant le [projet d'ordonnance final de Transparence de + la ville de Madrid](/docs/ordenanza_de_transparencia_de_la_ciudad_de_madrid.doc + 'Transparency Ordinance of the City of Madrid')" + title: Aidez-nous à traduire l'ordonnance de transparence de la ville de Madrid + process_2: + text: Nous comptons sur vous pour remplir ce court questionnaire pour décider + de ce nouvel espace dans votre ville. + title: Transformation de la Plaza de España + titles: + accessibility: Accessibilité + conditions: Conditions d'utilisation + more_information: Plus d'informations + opendata: Open Data + privacy: Vie privée + verify: + code: Code reçu dans votre courrier + email: Email + info: Pour vérifier votre compte, remplissez vos données de connexion. + info_code: Maintenant merci de remplir le code contenu dans votre courrier. + password: Mot de passe + submit: Vérifier mon compte + title: Vérifier mon compte + while_unfinished_html: Pendant que nous terminons, nous vous encourageons à visiter + Citizen Participation Area, Transparency and + Open Government blog pour vous informer sur nos nouvelles et pogrès ou sur + Citizen Participation section où vous décidez de la ville que + vous souhaitez. + proposals: + create: + form: + submit_button: Créer une proposition + edit: + editing: Modifier la proposition + form: + submit_button: Sauvegarder les changements + show_link: Voir les propositions + form: + proposal_external_url: Lien vers de la documentation complémentaire + proposal_question: Question proposée + proposal_question_example_html: 'Doit être résumé par une question appelant + à une réponse par oui ou par non. Exemple : ''Êtes-vous d''accord avec + la piétonnisation de Calle Mayor?''' + proposal_responsible_name: Nom complet de la personne qui soumet la proposition + proposal_responsible_name_note: "(individuellement ou comme représentant d'un + collectif; ne sera pas public)" + proposal_summary: Résumé de la proposition + proposal_summary_note: "(maximum 200 caractères)" + proposal_text: Texte de la proposition + proposal_title: Titre de la proposition + proposal_video_url: Lien vers une vidéo externe + proposal_video_url_note: Vous pouvez ajouter un lien vers YouTube ou Vimeo + tag_category_label: Catégories + tags_instructions: "Étiquetter cette proposition. Vous pouvez choisir parmi + les catégories proposées ou ajouter la vôtre" + tags_label: "Étiquettes" + tags_placeholder: Entrez les étiquettes que vous voudriez utiliser, séparer + par des virgules (',') + index: + featured_proposals: Mis en avant + filter_topic: + one: " avec sujet '%{topic}'" + other: " avec sujets '%{topic}'" + orders: + confidence_score: la plus votée + created_at: la plus récente + hot_score: la plus active + most_commented: la plus commentée + relevance: pertinence + search_form: + button: Chercher + placeholder: Chercher des propositions + title: Chercher + search_results: + one: " contenant le mot '%{search_term}'" + other: " contenant les mots '%{search_term}'" + select_order: Trier par + select_order_long: Vous êtes en train de voir les propositions en fonction de + start_proposal: Créer une proposition + title: Propositions + new: + form: + submit_button: Créer la proposition + more_info: Comment les propositions citoyennes marchent ? + recommendation_one: Ne pas user de lettres capitales dans le titre de votre + proposition ou des phrases entières. Sur internet, c'est considéré comme hurler + sur une personne. Et personne n'aime qu'on lui crie dessus. + recommendations_title: Recommendations pour créer une proposition + recommendation_three: Appréciez ces espaces et les voix qui le remplissent. + Tout vous appartient. + recommendation_two: Toute proposition ou commentaire suggérant une action illicite + sera supprimé ainsi que ceux qui perturbent les espaces de débats. Le reste + est autorisé. + start_new: Créer une nouvelle proposition + proposal: + already_supported: Vous avez déjà soutenu cette proposition. Partagez-la ! + comments: + one: 1 commentaire + other: "%{count} commentaires" + zero: Aucun commentaire + proposal: Proposition + reason_for_supports_necessary: 2% du Recensement + support: Soutenir + supports: + one: 1 soutien + other: "%{count} soutiens" + zero: Aucun soutien + supports_necessary: "%{number} soutiens nécessaires" + support_title: Soutenir cette proposition + total_percent: 100% + show: + author_deleted: Utilisateur effacé + code: Code de la proposition + comments: + one: 1 commentaire + other: "%{count} commentaires" + zero: No comments + edit_proposal_link: Modifier + flag: Cette proposition a été signalée comme inappropriée par plusieurs utilisateurs + login_to_comment: Vous devez %{signin} ou %{signup} pour laisser un commentaire. + share: Partager + update: + form: + submit_button: Sauvegarder des changements + settings: + email_domain_for_officials: Nom de domaine pour les personnes officielles + feature: + debates: Débats + spending_proposals: Propositions de dépenses + max_ratio_anon_votes_on_debates: Ratio maximum de votes anonymes par débat + max_votes_for_debate_edit: Nombre de votes à partir duquel un débat ne peut plus + être modifié + max_votes_for_proposal_edit: Nombre de votes à partir duquel une proposition ne + peut plus être modifiée + official_level_1_name: Niveau 1 personne officielle + official_level_2_name: Niveau 2 personne officielle + official_level_3_name: Niveau 3 personne officielle + official_level_4_name: Niveau 4 personne officielle + official_level_5_name: Niveau 5 personne officielle + per_page_code: Code à inclure dans chaque page + proposal_code_prefix: Préfixe pour les codes de propositions + votes_for_proposal_success: Nombre de votes nécessaires pour l'approbation d'une + proposition + shared: + advanced_search: + author_type: Par catégorie d'auteur + author_type_1: Fonctionnaire + author_type_2: Organisation municipale + author_type_3: Directeur général + author_type_4: Conseiller municipal + author_type_5: Maire + author_type_blank: Sélectionner une catégorie + date: Par date + date_1: Dernières 24 heures + date_2: La semaine passée + date_3: Le mois passé + date_4: L'année passée + date_5: La période de votre choix + date_placeholder: JJ/MM/AAAA + date_range_blank: Choisir une date + from: Depuis + general: Avec le texte + general_placeholder: "Écrire le texte" + search: Filtre + title: Recherche avancée + to: Pour + author_info: + author_deleted: Utilisateur effacé + check: Sélectionner + check_all: Tous + check_none: Aucune + collective: Collective + flag: Signaler comme inapproprié + print: + print_button: Imprimer cette info + tags_cloud: + categories: Catégories + districts: Secteurs + tags: Tendance + unflag: Désignaler + social: + blog: Blog + facebook: Facebook + twitter: Twitter + youtube: YouTube + social_share_button: + baidu: Baidu.com + delicious: Delicious + douban: Douban + email: Courriel + facebook: Facebook + google_bookmark: Marque-page Google + google_plus: Google+ + kaixin001: Kaixin001.com + pinterest: Pinterest + plurk: Plurk + qq: Qzone + renren: Renren.com + share_to: Partager avec %{name} + tqq: Tqq + tumblr: Tumblr + twitter: Twitter + weibo: Sina Weibo + spending_proposals: + form: + description: Description + external_url: Lien vers de la documentation supplémentaire + geozone: Périmètre de l'opération + submit_buttons: + create: Créer + new: Créer + title: Titre de la proposition de dépense + index: + title: Budget participatif + new: + back_link: Revenir en arrière + more_info: Comment le budget participatif marche ? + recommendation_one: Faire référence à une action budgétaire est obligatoire + pour la proposition. + recommendations_title: Comment cŕeer une proposition de dépense + recommendation_three: N'hésitez pas à détailler votre proposition pour que l'équipe + d'analyse la comprenne + recommendation_two: Toute proposition ou commentaire qui appelle à une action + illégale sera supprimée. + start_new: Créer la proposition de dépenses + support: + array: + last_word_connector: ", et" + two_words_connector: et + words_connector: "," + time: + am: am + formats: + datetime: "%d-%m-%Y %H:%M:%S" + default: "%a, %d %b %Y %H:%M:%S %z" + long: "%B %d, %Y %H:%M" + short: "%d %b %H:%M" + pm: pm + unauthorized: + default: Vous n'êtes pas autorisé(e) à accéder à cette page. + manage: + all: Vous n'êtes pas autorisé(e) à effectuer l'action '%{action}' sur %{subject}. + users: + show: + deleted: Effacé + deleted_debate: Ce débat a été effacé + deleted_proposal: Cette proposition a été effacée + filters: + comments: + one: 1 Commentaire + other: "%{count} Commentaires" + debates: + one: 1 Débat + other: "%{count} Débats" + proposals: + one: 1 Proposition + other: "%{count} Propositions" + no_activity: L'utilisateur n'a pas d'activité publique + private_activity: Cet utilisateur a choisi de garder privée sa liste d'activités + verification: + alert: + lock: Vous avez atteint le nombre maximum de tentatives. Merci de réessayer + plus tard. + back: Revenir à mon compte + email: + create: + alert: + failure: Un problème est survenu dans l'envoi de courriel à votre adresse. + flash: + success: Nous vous avons envoyé un courriel de confirmation vers votre adresse + %{email} + show: + alert: + failure: Code de vérification incorrect + flash: + success: Vous êtes un utilisateur vérifié + letter: + alert: + unconfirmed_code: Vous n'avez pas encore renseigné votre code de confirmation + create: + flash: + offices: Bureaux de soutien aux citoyens + offices_url: http://www.madrid.es/portales/munimadrid/es/Inicio/El-Ayuntamiento/Atencion-al-ciudadano/Oficinas-de-Atencion-al-Ciudadano?vgnextfmt=default&vgnextchannel=5b99cde2e09a4310VgnVCM1000000b205a0aRCRD + success_html: Merci d'avoir demandé votre code de sécurité maximum (uniquement + requis pour le vote final). Dans quelques jours, nous vous enverrons + un courrier vers votre adresse postale. Vous pouvez le réclamer dans n'importe + quel %{offices}. + edit: + see_all: Voir les propositions + title: Lettre requise + errors: + incorrect_code: Code de vérification incorrect + new: + explanation: 'Pour participer au vote final, vous pouvez :' + go_to_index: Voir les propositions + office: Vérifier dans n'importe quel %{office} + offices: Bureaux de soutien aux citoyens + offices_url: http://www.madrid.es/portales/munimadrid/es/Inicio/El-Ayuntamiento/Atencion-al-ciudadano/Oficinas-de-Atencion-al-Ciudadano?vgnextfmt=default&vgnextchannel=5b99cde2e09a4310VgnVCM1000000b205a0aRCRD + send_letter: Envoyer une lettre avec le code + title: Félicitations + user_permission_info: Avec votre compte, vous pouvez + update: + flash: + success: Code correct. Votre compte est désormais vérifié + redirect_notices: + already_verified: Votre compte est déjà vérifié + email_already_sent: Nous vous avons déjà envoyé un courriel avec un lien de + confirmation. Nous pouvons vous en renvoyer un ici. + residence: + alert: + unconfirmed_residency: Vous n'avez pas encore confirmé votre résidence + create: + flash: + success: Résidence vérifiée + new: + accept_terms_text: J'accepte %{terms_url} du recensement. + date_of_birth: Date de naissance + document_number: Numéro de document + document_type_label: Type de document + document_type: + passport: Passeport + residence_card: Carte de résident + spanish_id: CNI + error_not_allowed_age: Vous devez avoir plus de 16 ans + error_not_allowed_postal_code: Afin de pouvoir vérifier votre compte, vous + devez être enregistrer par la Municipalité de Madrid. + error_verifying_census: Il a été impossible pour le recensement de Madrid + de vérifier vos informations. Merci de confirmer que vos informations sont + correctes en appelant 010 (ou 915298210) ou en visitant n'importe quel %{offices}. + error_verifying_census_offices: 26 bureaux du citoyen + form_errors: Empêche la vérification de votre résidence + postal_code: Code postal + postal_code_note: Afin de vérifier votre compte, vous devez être inscrit dans + le récensement de Madrid + terms: Les conditions d'utilisation et d'accès + title: Vérifier la résidence + verify_residence: Vérifier la résidence + sms: + create: + flash: + success: Merci d'enregistrer le code de confirmation envoyé par texto + edit: + confirmation_code: Rentrer le code reçu sur votre mobile + resend_sms_link: Cliquer ici pour renvoyer + resend_sms_text: Le code de confirmation n'a pas été encore reçu ? + submit_button: Envoyer + title: Confirmation du code de sécurité + new: + phone: Entrez votre numéro de téléphone mobile pour recevoir le code + phone_format_html: "(Exemple: 612345678)" + phone_note: Nous utiliserons uniquement votre téléphone pour vous envoyer + ce code, sans jamais vous recontacter par la suite. + phone_placeholder: 'Exemple: 612345678' + submit_button: Envoyer + title: Envoyer le code de confirmation + update: + error: Code de vérification incorrect + flash: + level_three: + success: Code validé. Votre compte est vérifié + level_two: + success: Code correct + step_1: Résidence + step_2: Code de confirmation + step_3: Vérification finale + user_permission_debates: Participer aux débats + user_permission_info: En vérifiant votre compte vous serez capable de... + user_permission_proposal: Créer des propositions nouvelles + user_permission_support_proposal: Soutenir des propositions* + user_permission_votes: Participer au vote final* + verified_user: + form: + submit_button: Envoyer le code + show: + email_title: Courriels + explanation: Nous avons à l'heure actuelle les informations suivantes dans + notre base de données. Merci de sélectionner une méthode pour l'envoi de + votre code de confirmation. + phone_title: Téléphone + title: Information disponible + use_another_phone: Utiliser un autre téléphone + views: + pagination: + first: Première page + last: Dernière page + next: Page suivante + previous: Page précédente + truncate: "&hellip" + votes: + agree: Je suis d'accord + anonymous: Trop de votes anonymes pour accepter le vote %{verify_account}. + disagree: Je ne suis pas d'accord + organizations: Les organisations ne sont pas autorisées à voter + signin: Se connecter + signup: S'inscrire + supports: Soutiens + unauthenticated: Merci de vous %{signin} ou %{signup} pour continuer. + verified_only: Seuls les utilisateurs vérifiés peuvent voter sur les propositions; + %{verify_account}. + verify_account: Vérifier votre compte + welcome: + debates: + alt: Icone "débats" + description: Pour se rencontrer, discuter et partager les idées qui comptent + pour notre ville. + title: Débats + decide: + alt: Icône Décide + description: Le public décide s'il accepte ou refuse les propositions les plus + soutenues. + title: Vous décidez + do: + alt: Icône "c'est mis en place" + description: Si la proposition est acceptée par la majorité, la Mairie l'accepte + comme étant la sienne et la met en place. + title: C'est mis en place + featured: + proposals: + link: Voir les propositions + text: Créez vos propres propositions et soutenez celles d'autres citoyens. + title: Propositions citoyennes + more_information: Plus d'information sur cette page + proposal: + alt: Icône Proposez + description: Espace ouvert aux propositions sur le type de ville que nous voulons + title: Vous proposez + welcome: + go_to_index: Voir les propositions et les débats + title: Participer + user_permission_debates: Participez aux débats ! + user_permission_info: Avec votre compte, vous pouvez... + user_permission_proposal: Créer des propositions + user_permission_support_proposal: Soutenir des propositions + user_permission_verify: Réaliser toutes ces actions %{verify}. + user_permission_verify_info: "* Uniquement pour les utilisateurs inscrits sur + le recensement de Madrid" + user_permission_votes: Participer au vote final diff --git a/doc/locales/pt-br.yaml b/doc/locales/pt-br.yaml new file mode 100644 index 000000000..09521ecc2 --- /dev/null +++ b/doc/locales/pt-br.yaml @@ -0,0 +1,1703 @@ +--- +pt-BR: + account: + show: + change_credentials_link: Alterar meus dados pessoais + email_on_comment_label: Notificar-me por email quando alguém comentar sobre + minhas propostas ou debates + email_on_comment_reply_label: Notificar-me por email quando alguém responder + sobre meus comentários + erase_account_link: Apagar minha conta + finish_verification: Completar verificação + notifications: Notificações + organization_name_label: Nome da organização + organization_responsible_name_placeholder: Representante de organização/coletivo + personal: Dados pessoais + phone_number_label: Número de Telefone + public_activity_label: Manter pública minha lista de atividades + save_changes_submit: Salvar alterações + subscription_to_website_newsletter_label: Receber por email informações relevantes + deste site + title: Minha conta + username_label: Nome de usuário + user_permission_debates: Participar de debates + user_permission_info: Com a sua conta você pode... + user_permission_proposal: Criar nova proposta + user_permission_support_proposal: Apoiar propostas + user_permission_title: Participação + user_permission_verify: Para realizar todas as ações verifique sua conta. + user_permission_verify_info: "* Somente para usuários no Censo da Cidade de + Madrid." + user_permission_votes: Participar da votação final + verified_account: Conta verificada + verify_my_account: Verificar minha conta + activemodel: + attributes: + verification: + email: + recipient: Email + residence: + date_of_birth: Data de nascimento + document_number: Número do documento (incluindo letras) + document_type: Tipo de documento + postal_code: Código postal + sms: + confirmation_code: Código de confirmação + phone: Telefone + models: + verification: + residence: Residência + sms: Torpedo + activerecord: + attributes: + comment: + body: Comentário + user: Usuário + debate: + author: Autor + description: Opinião + terms_of_service: Termos de serviço + title: Título + organization: + name: Nome da organização + responsible_name: Pessoa responsável pelo grupo + proposal: + author: Autor + description: Descrição + question: Pergunta + terms_of_service: Termos de serviço + title: Título + user: + email: Email + official_level: Nível de coordenação + official_position: Cargo de coordenação + password: Senha + phone_number: Número de telefone + username: Nome de usuário + errors: + messages: + record_invalid: 'Falha de validação: %{errors}%' + restrict_dependent_destroy: + one: Registro não pode ser apagado porque existe um %{record}% dependente + many: Registro não pode ser apagado porque existe um %{record}% dependente + models: + debate: + attributes: + tag_list: + less_than_or_equal_to: as marcações necessitam ser menos ou igual a + %{count}% + proposal: + attributes: + tag_list: + less_than_or_equal_to: as marcações necessitam ser menos ou igual a + %{count}% + models: + activity: + one: atividade + other: atividades + administrator: + one: Administrador + other: Administradores + comment: + one: Comentário + other: Comentários + debate: + one: Debate + other: Debates + moderator: + one: Moderador + other: Moderadores + organization: + one: Organização + ou other tra: Organizações + proposal: + one: Proposta cidadã + other: Propostas cidadãs + spending_proposal: + one: Proposta de despesa + other: Propostas de despesa + tag: + one: Marcação + other: Marcações + user: + one: Usuário + other: Usuários + vote: + one: Voto + other: Votos + admin: + actions: + confirm: Tem certeza? + confirm_hide: Confirmar + hide: Ocultar + hide_author: Ocultar autor + restore: Restaurar + activity: + show: + action: Ação + actions: + block: Bloqueado + hide: Ocultado + restore: Restaurado + by: Moderado por + filter: Mostrar + filters: + all: Todos + on_comments: Comentários + on_debates: Debates + on_proposals: Propostas + on_users: Usuários + title: Atividade do moderador + type: Tipo + comments: + index: + filter: Filtro + filters: + all: Todos + with_confirmed_hide: Confirmado + without_confirmed_hide: Pendente + hidden_debate: Debate oculto + hidden_proposal: Proposta oculta + title: Comentários ocultos + dashboard: + index: + title: Administração + debates: + index: + filter: Filtro + filters: + all: Todos + with_confirmed_hide: Confirmado + without_confirmed_hide: Pendente + title: Debates ocultos + menu: + activity: Atividade do moderador + debate_topics: Tópicos de debate + hidden_comments: Comentários ocultos + hidden_debates: Debates ocultos + hidden_proposals: Propostas ocultas + hidden_users: Usuários ocultos + incomplete_verifications: Verificações incompletas + moderators: Moderadores + officials: Coordenadores + organizations: Organizações + settings: Opções de configuração + spending_proposals: Propostas de despezas + stats: Estatísticas + moderators: + index: + title: Moderadores + moderator: + add: Adicionar + delete: Apagar + search: + email_placeholder: Buscar usuário por email + search: Busca + user_not_found: Usuário não encontrado + officials: + edit: + destroy: Remover Status de 'Coordenador' + title: 'Coordenadores: Editar usuário' + flash: + official_destroyed: 'Detalhes salvos: o usuário não é mais um coordenador' + official_updated: Detalhes de coordenador salvo + index: + title: Coordenadores + level_0: Não coordenador + level_1: Nível 1 + level_2: Nível 2 + level_3: Nível 3 + level_4: Nível 4 + level_5: Nível 5 + search: + edit_official: Editar coordenador + make_official: Tornar coordenador + title: 'Cargos de coordenação: Buscar Usuário' + organizations: + index: + filter: Filtro + filters: + all: Todos + pending: Pendente + rejected: Recusado + verified: Verificado + reject: Recusar + rejected: Recusado + search: Busca + search_placeholder: Nome, email e número de telefone + title: Organizações + verified: Verificado + verify: Verificar + search: + title: Buscar Organizações + proposals: + index: + filter: Filtro + filters: + all: Todos + with_confirmed_hide: Confirmado + without_confirmed_hide: Pendente + title: Propostas ocultas + settings: + flash: + updated: Valor atualizado + index: + feature_flags: Recursos + features: + disable: Desabilitado + disabled: Recurso desabilitado + enable: Habilitado + enabled: Recurso habilitado + title: Opções de configuração + update_setting: Atualizar + shared: + proposal_search: + button: Buscar + placeholder: Buscar propostas por título, descrição ou questão + user_search: + button: Buscar + placeholder: Buscar por nome ou email + spending_proposals: + index: + title: Propostas de despesas para orçamento participativo + show: + by: Enviado por + geozone: Escopo + stats: + show: + stats_title: Estatísticas + summary: + comments: Comentários + comment_votes: Votos do comentário + debates: Debates + debate_votes: Votos do debate + proposals: Propostas + proposal_votes: Votos de proposta + unverified_users: Usuários sem verificação + user_level_three: Usuários de nível três + user_level_two: Usuários de nível dois + users: Total de usuários + verified_users: Usuários verificados + visits: Visitas + votes: Total de votos + tags: + create: Criar tópico + destroy: Eliminar tópico + index: + add_tag: Adicionar um novo tópico de debate + title: Tópicos de debate + mark_as_featured: Propor tópico na criação do debate + name: + placeholder: Digitar o nome do tópico + update: Atualizar tópico + users: + index: + filter: Filtro + filters: + all: Todos + with_confirmed_hide: Confirmado + without_confirmed_hide: Pendente + title: Usuários ocultos + show: + email: 'Email:' + hidden_at: 'Oculto em:' + registered_at: 'Registrado em:' + title: Atividade de usuário %{user} + verifications: + index: + phone_not_given: Telefone não informado + sms_code_not_confirmed: O código via torpedo não foi confirmado + title: Verificações incompletas + application: + close: Fechar + menu: Menu + ckeditor: + buttons: + cancel: Cancelar + delete: Apagar + next: Próximo + upload: Carregar + confirm_delete: Apagar arquivo? + page_title: Gerenciador de Arquivos CKEditor + comments: + comment: + admin: Administrador + author: Autor + deleted: Este comentário foi apagado + moderator: Moderador + responses: + one: 1 resposta + other: "%{count} respostas" + zero: Nenhuma resposta + user_deleted: Usuário apagado + votes: + one: 1 voto + other: "%{count} votos" + zero: Nenhum voto + form: + comment_as_admin: Comentar como admin + comment_as_moderator: Comentar como moderador + leave_comment: Deixe seu comentário + orders: + most_voted: Mais votado + newest: Mais recente primeiro + oldest: Mais antigo primeiro + select_order: Organizado por + show: + return_to_commentable: Voltar para + comments_helper: + comment_button: Publicar comentário + comment_link: Comentar + reply_button: Publicar resposta + reply_link: Responder + date: + abbr_day_names: + - Dom + - Seg + - Ter + - Qua + - Qui + - Sex + - Sab + abbr_month_names: + - Jan + - Fev + - Mar + - Abr + - Mai + - Jun + - Jul + - Ago + - Set + - Out + - Nov + - Dez + day_names: + - Domingo + - Segunda + - Terça + - Quarta + - Quinta + - Sexta + - Sábado + formats: + default: "%Y-%m-%d" + long: "%B %d, %Y" + short: "%b %d" + month_names: + - Janeiro + - Fevereiro + - Março + - Abril + - Maio + - Junho + - Julho + - Agosto + - Setembro + - Outubro + - Novembro + - Dezembro + order: + - ano + - mês + - dia + datetime: + distance_in_words: + about_x_hours: + one: cerca de 1 hora + other: cerca de %{count} horas + about_x_months: + one: cerca de 1 mês + other: cerca de %{count} meses + about_x_years: + one: cerca de 1 ano + other: cerca de %{count} anos + almost_x_years: + one: quase 1 ano + other: quase %{count} anos + half_a_minute: meio minuto + less_than_x_minutes: + one: menos de um minuto + other: menos de %{count} minutos + less_than_x_seconds: + one: menos de um segundo + other: menos de %{count} segundos + over_x_years: + one: mais de 1 ano + other: mais de %{count} anos + x_days: + one: 1 dia + other: "%{count} dias" + x_minutes: + one: 1 minuto + other: "%{count} minutos" + x_months: + one: 1 mês + other: "%{count} meses" + x_seconds: + one: 1 segundo + other: "%{count} segundos" + prompts: + day: Dia + hour: Hora + minute: Minuto + month: Mês + second: Segundos + year: Ano + debates: + create: + form: + submit_button: Iniciar um debate + debate: + comments: + one: 1 comentário + other: "%{count} comentários" + zero: Nenhum comentário + debate: Debate + votes: + one: 1 voto + other: "%{count} votos" + zero: Nenhum voto + edit: + editing: Editar debate + form: + submit_button: Salvar alterações + show_link: Ver debate + form: + debate_text: Texto inicial do debate + debate_title: Título do debate + tags_instructions: Marcar este debate. + tags_label: Tópicos + tags_placeholder: Entrar com as marcações que deseja usar, separadas por vírgulas + (',') + index: + featured_debates: Recursos + filter_topic: + one: " com tópico '%{topic}'" + other: " com tópicos '%{topic}'" + orders: + confidence_score: melhor avaliada + created_at: "última" + hot_score: mais ativa + most_commented: mais comentada + relevance: relevância + search_form: + button: Buscar + placeholder: Buscar debates... + title: Buscar + search_results: + one: " contendo o termo '%{search_term}'" + other: " contendo os termos '%{search_term}'" + select_order: Ordenar por + start_debate: Iniciar um debate + title: Debates + new: + form: + submit_button: Iniciar um debate + info: Se quiser elaborar uma proposta, esta seção é inadequada, entre %{info_link}. + info_link: criar nova proposta + more_info: Mais informações + recommendation_four: Aproveite este espaço e as vozes que ele preenche. Ele + pertence a você. + recommendation_one: Não use letras maiúsculas para o título do debate ou para + sentenças completas. Na internet, isto é considerado gritaria. Ninguém gosta + de ser tratado com gritos. + recommendations_title: Recomendações para criar um debate + recommendation_three: Criticismo impiedoso é bem-vindo. Este é um espaço para + reflexão. Mas recomendamos que você mantenha sua inteligência e elegância. + O mundo é um lugar melhor com estas virtudes em prática. + recommendation_two: Todo debate ou comentário sugerindo ações ilegais serão + apagados, bem como aqueles tentando sabotar os espaços de debate. Tudo mais + será permitido. + start_new: Iniciar um debate + show: + author_deleted: Usuário apagado + comments: + one: 1 comentário + other: "%{count} comentários" + zero: Nenhum comentário + comments_title: Comentários + edit_debate_link: Editar + flag: Este debate foi marcado como inapropriado por vários usuários. + login_to_comment: Você precisa %{signin} ou %{signup} para deixar um comentário. + share: Compartilhar + update: + form: + submit_button: Salvar alterações + devise: + confirmations: + confirmed: Sua conta foi confirmada. + send_instructions: Em alguns instantes você receberá um email contendo as instruções + de como redefinir sua senha. + send_paranoid_instructions: Se o seu email estiver em nossa base de dados, em + alguns instantes você receberá um email contendo as instruções de como redefinir + sua senha. + failure: + already_authenticated: Você já está autenticado. + inactive: Sua conta não foi ativada. + invalid: "%{authentication_keys} ou senha inválida." + last_attempt: Você ainda possui uma ou mais tentativas restando, antes de sua + conta ser bloqueada. + locked: Sua conta foi bloqueada + not_found_in_database: "%{authentication_keys} ou senha inválida." + timeout: Sua sessão de usuário expirou. Por favor inicie nova sessão para continuar. + unauthenticated: Você precisa iniciar uma sessão de usuário ou registrar-se + para continuar. + unconfirmed: Para continuar, por favor clique no link de confirmação que enviamos + para você por email. + mailer: + confirmation_instructions: + subject: Instruções de confirmação + password_change: + subject: Senha alterada + reset_password_instructions: + subject: Instruções para redefinir sua senha + unlock_instructions: + subject: instruções de desbloqueio + omniauth_callbacks: + failure: Não foi possível autorizar você como %{kind} porque "%{reason}". + success: Identificado com sucesso como %{kind}. + passwords: + no_token: Você não pode acessar esta página, exceto através de um link (URL) + de redefinição da senha. Se o acesso foi através de um link de redefinição + de senha, por favor verifique se ele está completo. + send_instructions: Em alguns instantes, você receberá um email contendo as instruções + para redefinir sua senha. + send_paranoid_instructions: Se você está em nossa base de dados, em alguns instantes, + você receberá um email contendo as instruções para redefinir sua senha. + updated: Sua senha foi alterada com sucesso. Autenticação bem sucedida. + updated_not_active: Sua senha foi alterada com sucesso. + registrations: + destroyed: Despedimo-nos! Sua conta foi cancelada. Esperamos vê-lo brevemente. + De acordo com sua solicitação, dados pessoais registrados como um usuário + do site decide.madrid.es que participa do arquivo 'Gestión de procesos participativos' + sob a responsabilidade da Dirección General de Participación Ciudadana, foram + todos apagados sob os termos e provisões do Artigo 16 da Lei Orgânica 15/1999 + de Proteção de dados de Caráter Pessoal e o Artigo 31 dos seus Regulamentos + de desenvolvimento (RD 1720/20017). + signed_up: Seja bem-vindo! Você foi autenticado. + signed_up_but_inactive: Seu registro obteve sucesso, mas você pode ser autenticado + porque sua conta não foi ativada. + signed_up_but_locked: Seu registro obteve sucesso, mas você pode ser autenticado + porque sua conta está bloqueada. + signed_up_but_unconfirmed: Uma mensagem foi enviada para você contendo um link + de verificação. Por favor clique neste link para ativar sua conta. + updated: Sua conta foi atualizada com sucesso. + update_needs_confirmation: Sua conta foi atualizada com sucesso; no entanto, + nós necessitamos verificar seu novo endereço de email. Por favor confira seu + email e clique no link para completar a confirmação de seu novo endereço de + email. + sessions: + already_signed_out: Você realizou sua saída de maneira adequada. + signed_in: Você foi autenticado com sucesso. + signed_out: Você realizou sua saída de maneira adequada. + unlocks: + send_instructions: Em alguns instantes, você receberá um email contendo as instruções + de como desbloquear sua conta. + send_paranoid_instructions: Se você possui uma conta, em alguns instantes você + receberá um email contendo as instruções de como desbloquear sua conta. + unlocked: Sua conta foi desbloqueada. Por favor inicie uma sessão de usuário + para continuar + devise_views: + confirmations: + new: + email_label: Email + submit: Reenvie instruções + title: Reenvie instruções de confirmação + show: + instructions_html: Confirmando a conta com email %{email} + new_password_confirmation_label: Repetir a senha de acesso + new_password_label: Nova senha de acesso + please_set_password: Por favor escolha sua nova senha (ela permitirá que você + inicie uma sessão de usuário com o email acima) + submit: Confirmar + title: Confirmar sua conta + mailer: + confirmation_instructions: + confirm_link: Confirmar minha conta + text: 'Você pode confirmar sua conta de email no link a seguir:' + title: Seja bem-vindo ao Portal do Governo Aberto da Câmara da Cidade de Madrid + welcome: Seja bem-vindo + reset_password_instructions: + change_link: Alterar sua senha + hello: Olá + ignore_text: Se você não solicitou uma alteração de senha, pode ignore este + email. + info_text: Sua senha não será alterada, a menos que você acesse o link e edite + a mesma. + text: 'Nós recebemos uma solicitação para alteração de sua senha. Você poderá + realizar isto, seguindo este link:' + title: Alterar sua senha + unlock_instructions: + hello: Olá + info_text: Sua conta será bloqueada após o número excessivo falhas na tentativa + de autenticar o início de uma sessão. + instructions_text: 'Por favor clique neste link para desbloquear sua conta:' + title: Sua conta foi bloqueada + unlock_link: Desbloqueie minha conta + menu: + login_items: + login: Iniciar uma sessão + logout: Encerrar esta sessão + signup: Registrar + organizations: + registrations: + new: + email_label: Email + organization_name_label: Nome da organização + password_confirmation_label: Confirmar senha + password_label: Senha + phone_number_label: Número de telefone + responsible_name_label: Nome completo da pessoa responsável pelo coletivo + responsible_name_note: Esta será a pessoa representando a associação/coletivo + na qual será identificada as propostas apresentadas + submit: Registrar + title: Registrar como uma organização ou coletivo + success: + back_to_index: Eu compreendo; voltar para a página principal + instructions_1_html: "Entraremos em contato brevemente para verificar + que você de fato representa este coletivo." + instructions_2_html: Enquanto seu email é verificado, nós lhe enviamos + um link para confirmar sua conta. + instructions_3_html: Depois de confirmado, você poderá iniciar a participação + como um coletivo sem verificação + thank_you_html: Obrigado por registrar seu coletivo no website. Ele está + agora pendente de verificação. + title: Registro de organização/coletivo + passwords: + edit: + change_submit: Alterar minha senha + password_confirmation_label: Confirmar nova senha + password_label: Nova senha + title: Alterar sua senha + new: + email_label: Email + send_submit: Enviar instruções + title: Esqueceu a senha? + sessions: + new: + email_label: Email + password_label: Senha + remember_me: Lembre-me + submit: Entrar + title: Iniciar sessão + shared: + links: + login: Entrar + new_confirmation: Não recebeu as instruções para ativar sua conta? + new_password: Esqueceu sua senha? + new_unlock: Não recebeu as instruções de desbloqueio? + signin_with_provider: Iniciar sessão com %{provider} + signup: Não possui uma conta? %{signup_link} + signup_link: Inscrever + unlocks: + new: + email_label: Email + submit: Reenvie as instruções de desbloqueio + title: Reenvie as instruções de desbloqueio + users: + registrations: + delete_form: + erase_reason_label: Razão + info: Esta ação não pode ser desfeita. Por favor certifique que isto é o + que você deseja. + info_reason: Se desejar, deixe-nos uma razão (opcional). + submit: Apagar minha conta + title: Apagar conta + edit: + current_password_label: Senha atual + edit: Editar + email_label: Email + leave_blank: Deixe vazio se você não deseja modificar + need_current: Necessitamos de sua senha atual para confirmar as alterações + password_confirmation_label: Confirmar nova senha + password_label: Nova senha + update_submit: Atualizar + waiting_for: 'Aguardando confirmação de:' + new: + cancel: Cancelar inicio de sessão + email_label: Email + organization_signup: Você representa uma organização ou coletivo? %{signup_link} + organization_signup_link: Increva aqui + password_confirmation_label: Confirmar senha + password_label: Senha + submit: Registrar + terms: Registrando-se você aceita os %{terms} + terms_link: termos e condições de uso + title: Registrar + username_is_available: Nome de usuário disponível + username_is_not_available: Nome de usuário não disponível + username_label: Nome de usuário + username_note: Nome que aparecerá próximo de suas postagens + success: + back_to_index: Eu entendo; voltar para a página principal + instructions_1_html: Por favor confira seu email - nós lhe enviamos + um link para confirmar sua conta. + instructions_2_html: Após confirmação, você poderá iniciar a participação. + thank_you_html: Obrigado por registrar no website. Você deve agora confirmar + sei endereço de email. + title: Modificar seu email + errors: + format: "%{attribute} %{message}" + messages: + accepted: precisa ser aceito + already_confirmed: Você já foi verificado; por favor tente iniciar uma sessão. + blank: não pode ficar vazio + confirmation: Não confere %{attribute} + confirmation_period_expired: Você precisa ser verificado dentro %{period}; por + favor solicite novamente. + empty: não pode ficar vazio + equal_to: precisa ser igual a %{count} + even: precisar ser par + exclusion: está reservado + expired: expirou; por favor repita a solicitação + greater_than: precisa ser maior que %{count} + greater_than_or_equal_to: precisa ser maior ou igual a %{count} + inclusion: não está incluido na lista + invalid: "é inválido" + less_than: precisa ser menos que %{count} + less_than_or_equal_to: precisa ser menos que ou igual a %{count} + not_an_integer: precisa ser um número inteiro + not_a_number: não é um número + not_found: não encontrado. + not_locked: não estava bloqueado. + not_saved: + one: '1 erro impediu este %{resource} de ser salvo:' + other: "%{count} erro impediu estes %{resource} de serem salvos:" + odd: precisa ser impar + other_than: precisa ser outro que %{count} + present: precisa estar vazio + taken: já foi ocupado + too_long: + one: "é muito longo (máximo é 1 caracter)" + other: "é muito longo (máximo é %{count} caracteres)" + too_short: + one: "é muito curto (mínimo é 1 caracter)" + other: "é muito curto (mínimo é %{count} caracteres)" + user_not_found: Usuário não encontrado + wrong_length: + one: "é a extensão errada (deve ser 1 caracter)" + other: "é a extensão errada (deve ser %{count} caracteres)" + flash: + actions: + create: + debate: Debate criado com sucesso. + notice: "%{resource_name} criado com sucesso." + proposal: Proposta criada com sucesso. + spending_proposal: Proposta de despesa criada com sucesso. + destroy: + alert: "%{resource_name} não pode ser apagado." + notice: "%{resource_name} foi apagado com sucesso." + save_changes: + notice: Alterações salvadas + update: + debate: Debate atualizado com sucesso. + notice: "%{resource_name} atualizado com sucesso." + proposal: proposta atualizada com sucesso. + form: + accept_terms: Eu concordo com a %{policy} e as %{conditions} + conditions: Termos e condições de uso + debate: Debate + error: erro + errors: erros + not_saved: 'impediu este %{resource} de ser salvo:' + policy: Política de privacidade + proposal: Proposta + spending_proposal: Porposta de despesa + user: Conta + geozones: + none: Toda a cidade + helpers: + page_entries_info: + entry: + one: Entrada + other: Entradas + zero: Entradas + more_pages: + display_entries: Mostrando %{first} - %{last} de %{total} + %{entry_name} + one_page: + display_entries: + zero: "%{entry_name} não pode ser encontrada" + one: Existe 1 %{entry_name} + other: Existem %{count} %{entry_name} + select: + prompt: Por favor escolha + submit: + create: Criar %{model} + submit: Salvar %{model} + update: Atualizar %{model} + layouts: + application: + chrome: Google Chrome + firefox: Firefox + ie: Nós detectamos que você está navegando com o Internet Explorer. Para uma + melhor experiência, nós recomendamos o uso do %{chrome} ou %{firefox}. + ie_title: Este website não está otimizado para o seu navegador + footer: + accessibility: Acessibilidade + conditions: Termos e condições de uso + consul: Aplicativo Consul + consul_url: https://github.com/consul/consul + contact_us: Para suporte técnico entre + copyright: Ayuntamiento de Madrid, %{year} + description: Este portal usa o %{consul} que é %{open_source}. De Madrid para + o mundo. + faq: suporte técnico + more_info: Mais informações + open_data_text: Todos os detalhes sobre a Câmara estão disponíveis para acesso. + open_data_title: Dados abertos + open_source: programa de código aberto + open_source_url: http://www.gnu.org/licenses/agpl-3.0.html + participation_text: Decida como adequar a Madrid que você deseja viver. + participation_title: Participação + privacy: Política de privacidade + transparency_text: Descubra tudo sobre a Câmara da Cidade de Madrid. + transparency_title: Transparência + transparency_url: https://transparencia.madrid.es + header: + administration: Administração + debates: Debates + external_link_blog: Blog + external_link_opendata: Dados abertos + external_link_opendata_url: http://datos.madrid.es + external_link_transparency: Transparência + external_link_transparency_url: https://transparencia.madrid.es + locale: 'Idioma:' + logo: Madrid + moderation: Moderação + more_information: Mais informações + my_account_link: Minha conta + my_activity_link: Minha atividade + new_notifications: + one: Você tem uma nova notificação + other: Você tem %{count} novas notificações + no_notifications: Vocie nnao possui novas notificações + open: aberto + open_city_slogan_html: Existem cidades que são governadas diretamente por seus + habitantes, que discutem os tópicos que lhes preocupam, propõe + ideias para melhorar suas vidas e decidem entre eles mesmos quais serão + implementadas. Madrid já é uma dessas cidades. + open_city_title: Ame a cidade e ela se transformará na cidade que você ama. + open_data: Dados abertos + open_gov: Governo aberto + processes: Processos abertos + proposals: Propostas + spending_proposals: Propostas de despesas + locale: Português brasileiro + mailers: + comment: + hi: Olá + new_comment_by_html: Existe um novo comentário de %{commenter} + subject: Alguém comentou em seu %{commentable} + title: Novo comentário + config: + manage_email_subscriptions: Para interromper estes emails altere suas configurações + email_verification: + click_here_to_verify: este link + instructions_2_html: Este email verificará sua conta com %{document_type} + %{document_number}. Se esta não pertence a você, por favor não clique + no link anterior e ignore este email. + instructions_html: Para completar a verificação de sua conta de usuário no Portal + do Governo Aberto da Câmara da Cidade de Madrid, você precisa clicar %{verification_link}. + subject: Confirme seu email + thanks: Muito obrigado. + title: Confirme sua conta usando o link seguinte + reply: + hi: Olá + new_reply_by_html: Existe uma nova resposta %{commenter} para seu comentário + subject: Alguém respondeu ao seu comentário + title: Nova resposta ao seu comentário + management: + account_info: + change_user: Alterar usuário + document_number_label: 'Número do documento:' + document_type_label: 'Tipo do documento:' + email_label: 'Email:' + identified_label: 'Identificado por:' + username_label: 'Nome de usuário:' + check: Conferir + dashboard: + index: + title: Gerenciar + document_number: Número do documento + document_type_label: Tipo do documento + document_verifications: + already_verified: Esta conta de usuário já foi verificada. + has_no_account_html: No sentido de criar uma conta, vá para %{link} e clique + em 'Register' na parte superior esquerda de sua tela/janela. + in_census_has_following_permissions: 'Este usuário pode participar no website + com as seguintes permissões:' + not_in_census: Este documento não está registrado em Madrid. + not_in_census_info: 'Cidadãos fora do Censo podem participar no website com + as seguintes permissões:' + please_check_account_data: Por favor confira se os dados da conta acima estão + corretos. + title: Gerenciamento de usuário + under_age: Você precisa ter 16 anos ou mais para verificar sua conta. + verify: Verificar + email_label: Email + email_verifications: + already_verified: Esta conta de usuário já foi verificada. + choose_options: 'Por favor escolha uma das opções seguintes:' + document_found_in_census: Este documento foi encontrado no Censo, mas não possui + conta de usuário associada ao mesmo. + document_mismatch: 'Este email pertence a um usuário que já possui um id associado: + %{document_number}(%{document_type})' + email_placeholder: Escreva o email que esta pessoa usou para criar a conta dele + ou dela + email_sent_instructions: No sentido de verificar completamente este usuário, + é necessário que o usuário clique em um link que enviamos para a conta de + email acima. Este passo é necessário para confirmar que o endereço pertence + a ele. + if_existing_account: Se a pessoa já possui uma conta de usuário criada neste + website, + if_no_existing_account: Se esta pessoa ainda não criou uma conta + introduce_email: 'Por favor introduza o email usado na conta:' + send_email: Enviar email de verificação + menu: + create_proposal: Criar proposta + create_spending_proposal: Criar proposta de despesa + print_proposals: Imprimir propostas + support_proposals: Apoiar propostas + title: Gerenciamento + users: Usuários + permissions: + create_proposals: Criar propostas + debates: Participar em debates + support_proposals: Apoiar propostas + vote_proposals: Votar em propostas + print_info: Imprimir esta informação + print: + proposals_title: 'Propostas:' + proposals: + alert: + unverified_user: Usuário não verificado + create_proposal: Criar proposta + print: + print_button: Imprimir + sessions: + signed_out: Sessão encerrada com sucesso. + signed_out_managed_user: Sessão de usuário encerrada com sucesso. + spending_proposals: + alert: + unverified_user: Usuário não verificado + create: Criar proposta de despesa + username_label: Nome de usuário + users: + create_user: Criar uma nova conta + create_user_info: 'Criaremos uma conta com os seguinte dados:' + create_user_submit: Criar usuário + create_user_success_html: Nós enviamos um email para o endereço %{email} + no sentido de verificar que ele pertence a este usuário. Ele contém um link + que deve ser clicado. Em seguida deve ser criado uma senha de acesso antes + ser possível iniciar uma sessão no website. + map: + proposal_for_district: Inicie uma proposta para seu distrito + select_district: Escopo da operação + start_proposal: Criar uma proposta + title: Distritos + moderation: + comments: + index: + block_authors: Bloquear autores + confirm: Tem certeza? + filter: Filtro + filters: + all: Todos + pending_flag_review: Pendente + with_ignored_flag: Marcado como visto + headers: + comment: Comentário + moderate: Moderado + hide_comments: Ocultar comentários + ignore_flags: Marcar como visto + order: Ordem + orders: + flags: Mais marcado + newest: Mais recente + title: Comentários + dashboard: + index: + title: Moderação + debates: + index: + block_authors: Bloquear autores + confirm: Tem certeza? + filter: Filtro + filters: + all: Todos + pending_flag_review: Pendente + with_ignored_flag: Marcado como visto + headers: + debate: Deabate + moderate: Moderado + hide_debates: Ocultar debates + ignore_flags: Marcar como visto + order: Ordem + orders: + created_at: Mais recente + flags: Mais marcado + title: Debates + menu: + flagged_comments: Comentários + flagged_debates: Debates + proposals: Propostas + users: Bloquear usuários + proposals: + index: + block_authors: Bloquear autores + confirm: Tem certeza? + filter: Filtro + filters: + all: Todos + pending_flag_review: Revisão pendente + with_ignored_flag: Marcar como visto + headers: + moderate: Moderate + proposal: Proposta + hide_proposals: Ocultar propostas + ignore_flags: Marcar como visto + order: Ordenado por + orders: + created_at: Mais recente + flags: Mais marcado + title: Propotas + users: + index: + hidden: Bloqueado + hide: Bloquear + search: Buscar + search_placeholder: email ou nome de usuário + title: Bloquear usuários + notice_hide: Usuário bloqueado. Todos os debates desse usuário e os comentários + foram ocultados. + notifications: + index: + comments_on: + one: Alguém comentou sobre + other: Existem %{count} novos comentários sobre + empty_notifications: Você não possui novas notificações + mark_all_as_read: Marcar todos como lidos + replies_to: + one: Alguém respondeu sobre + other: Existem %{count} novas respostas para seu comentário sobre + title: Notificações + number: + currency: + format: + delimiter: "," + format: "%u%n" + precision: 2 + separator: "." + significant: false + strip_insignificant_zeros: false + unit: "$" + format: + delimiter: "," + precision: 3 + separator: "." + significant: false + strip_insignificant_zeros: false + human: + decimal_units: + format: "%n %u" + units: + billion: Bilhão + million: Milhão + quadrillion: Quadrilhão + thousand: Mil + trillion: Trilhão + unit: vazio + format: + delimiter: vazio + precision: 3 + significant: true + strip_insignificant_zeros: true + storage_units: + format: "%n %u" + units: + byte: + one: Byte + other: Bytes + gb: GB + kb: KB + mb: MB + tb: TB + percentage: + format: + delimiter: vazio + format: "%n%" + precision: + format: + delimiter: vazio + omniauth: + facebook: + sign_in: Iniciar sessão com o Facebook + sign_up: Inscrever-se com o Facebook + finish_signup: + title: Detalhes adicionais + google_oauth2: + sign_in: Iniciar sessão com o Google + sign_up: Inscrever-se com o Google + twitter: + sign_in: Iniciar sessão com o Twitter + sign_up: Inscrever-se com o Twitter + pages: + census_terms: Para confirmar a conta, você deve ter 16 anos ou mais e ser registrado + como residente de Madrid, tendo provido a informação requerida previamente, + que a Direção-Geral de participação Civil verificará contra os arquivos do 'Censo + Municipal de Habitantes', pelo qual a Direção-Geral para Estatísticas é responsável, + e o 'Serviço de Suporte ao Cidadão', pelo qual a Direção-Geral pela Qualidade + e Serviços ao Cidadão é responsável. Aceitando o processo de verificação, você + também consente pela verificação destas informações, como também pelos recursos + dos métodos de contato no arquivo 'Gerenciamento de Atividades Participativas' + mencionado previamente nos termos e condições de uso deste Portal. + conditions: Termos e condições de uso + general_terms: Termos e condições + more_information: + description: + faq: Perguntas frequentes feitas sobre problemas técnicos + how_it_works: Descubra tudo que você pode fazer com este website. + how_to_use: Use-o livremente ou ajude-nos a melhora-lho, isto é um programa + de código livre + participation: Participação cidadã, transparente e governo aberto + participation_facts: Para perder seu medo + participation_world: Sistemas de participação cidadã que existem no mundo + proposals_info: Criar suas próprias propostas + signature_sheet: Página de coleta de assinaturas para apoio + spending_proposals_info: Criar sua propria proposta de despesa + how_it_works: + i: Participação + i1: "Área de debates" + i2: "Área de propostas" + text: "O novo Portal de Governo Aberto é dividido em três partes: participação, + transparência e dados Abertos (você pode ver os links na parte superior + do lado direito).\r\n>** I. Participação: ** Nesta parte podemos decidir + que cidade queremos (usando propostas cidadãs, áreas de debate, orçamentos + participativos, legislação colaborativa, e muitos outros que iremos implementar).\r\n**II. + Transparência: ** Nesta parte serão publicadas informações sobre como Madrid + é gerida todos os dias: nome, cargo, salário, contratos, agenda, ... das + pessoas responsáveis. É também o lugar para exercer o seu direito de acesso + à informação, tendo a chance de solicitar qualquer de solicitar qualquer + informação sobre a Câmara Municipal de Madrid de maneira fácil e rápida.\r\n**III. + Dados abertos: ** Nesta parte os bancos de dados da câmara da cidade são + postados, de modo que qualquer pessoa pode usar as informações diretamente, + sem ter que pedir. Podendo também ser solicitado a publicação de mais bases + de dados.\r\n\r\nAbrimos o novo portal de Participação e vamos abrir a nova + seção Transparência e Dados Abertos brevemente (enquanto isso os links para + sites existentes são mantidos).\r\n## I. Participação\r\nA + secção de participação terá diferentes formas: as propostas cidadãs, áreas + de debate, orçamentos participativos, legislação colaborativa, e muitos + outros. Atualmente, você pode visitar a área de debate e as propostas cidadãs + estarão prontas muito em breve.\r\n## I.I. Área de debates\r\nNa + área de debates todos podem abrir uma linha de discussão sobre qualquer + assunto, criando um espaço independente onde as pessoas podem debater sobre + o tema proposto. Desta forma, neste espaço digital, haverá centenas de diferentes + espaços de debate que os cidadãos podem ver, juntando-se os que achar mais + interessante.\r\n\r\nAmbos os tópicos e comentários poderão ser avaliados + por qualquer pessoa, de modo que a cidadania, e não alguém em seu nome, + irá decidir quais são as questões mais importantes em cada momento. Estes + serão mostrados na página principal do espaço, sendo todos capazes de acessar + também o resto das questões nas páginas seguintes ou usando outros critérios + de ordenação (o mais comentado, o recente, o mais controverso, etc.).\r\n\r\nCada + funcionário da Câmara da cidade tem seu próprio usuário, que será designado + como tal, permitindo-lhes participar em debates no mesmo nível que o resto + dos cidadãos. Este formato permitirá a criação de espaços de comunicação + direta entre todos, evitando os problemas que implicam a comunicação mediada + e seguindo abordagem clara da nova Câmara Municipal de Madrid em virtude + da qual o conselho da cidade trabalha para a cidadania.\r\n## + I.I. Área de propostas\r\nNa área de propostas todos podem propor uma + iniciativa com a intenção de recolher apoio suficiente para a idéia sendo + consultada por toda a cidadania, com efeito vinculativo.\r\n\r\nAs propostas + podem ser apoiadas por todos os cidadãos registrados em Madrid que verificaram + a sua conta na plataforma de participação. Desta forma, a cidadania e não + alguém em seu nome, irá decidir quais são as propostas que valem a pena + levar a cabo.\r\n\r\nAssim que a proposta atingir o apoio de 2% Madrid recenseada + (cerca de 53.000 pessoas), será estudado por um grupo conselheiro da cidade, + avançar além da fase de consulta popular, em que a cidadania de Madrid vai + votar se a proposta será realizada ou não. O prazo máximo para obter apoio + suficiente é de 12 meses." + how_to_use: + text: "Use este programa em seu governo local ou nos ajude a melhorá-lo, ele + é um software livre.\r\n\r\nEste Portal de Governo Aberto usa o [app Consul] + (https://github.com/ayuntamientomadrid 'cônsul github'), que é um software + livre, com [licença AGPLv3] (http://www.gnu.org/licenses/agpl- 3.0.html + 'AGPLv3 gnu'), o que significa, em palavras simples que qualquer um pode + usar o código livremente, copiá-lo, vê-lo em detalhes, modificá-lo e redistribuí-lo + para o mundo, com as modificações que se quiser (permitindo a outros fazer + o mesmo). Porque pensamos que a cultura é melhor e mais rica quando for + compartilhada.\r\n\r\nNão somente você pode usar livremente este portal + no governo local, mas você também será ajudado pelo conselho da cidade de + Madrid, o tanto quanto possível para fazê-lo, por isso, se você estiver + interessado escreva-nos: ag.gobiernoabierto@madrid.es \r\n\r\nSe você é um programador, você + pode ver o código e nos ajudar a melhorá-lo em [app Consul] (https://github.com/ayuntamientomadrid + 'cônsul github')." + titles: + faq: Solução para problemas técnicos (FAQ) + how_it_works: Como funciona este Portal de Governo Aberto? + how_to_use: Use-o em seu governo local + participation: Participação e Transparência em Madrid e Transparência - notícias + recentes + participation_facts: Fatos sobre participação cidadã e democracia direta + participation_world: Participação cidadã direta no mundo + proposals_info: Como as propostas cidadãs funcionam? + signature_sheet: Página de assinaturas + spending_proposals_info: Como funciona o orçamento participativo? + opendata: + go_old: Vá para o Portal de Dados Abertos + slogan_html: 'Estamos trabalhando no novo Portal de Dados Abertos da Câmara + da Cidade de Madrid, enquanto isso você pode visitar o atual Portal de Dados + abertos:' + title: Dados Abertos + privacy: Políticas de Privacidade + processes: + back: Voltar + index: + process_1_button: Mais informações + process_1_description: Madrid quer lançar um sistema de transparência pública + de nível mais avançado no mundo e nós precisamos de sua ajuda. + process_1_title: Planejamento transparente + process_2_button: Mais informações + process_2_description: Contamos com você para decidir como você deseja este + novo espaço em sua cidade. + process_2_title: Remodelagem da Plaza Espanã. + process_1: + button: Comentar o planejamento + comment: deixe seus comentários + text: "Até o próximo 31 de janeiro você pode %{comment} o ante-projeto de + Orçamento Transparente da cidade de Madrid ou enviar um e-mail para transparencia@madrid.es.\r\n\r\nAgora + você pode ver o [projeto final Orçamento Transparente da Cidade de Madrid] + (/docs/ordenanza_de_transparencia_de_la_ciudad_de_madrid.doc 'Orçamento + Transparente da Cidade de Madrid')." + title: Ajude-nos a melhorar + process_2: + text: Contamos com você no preenchimento de uma enquete curta de como você + gostaria que fosse este novo espaço em sua cidade. + title: Remodelagem da Plaza de España + titles: + accessibility: Acessibilidade + conditions: Termos de uso + more_information: Mais informações + opendata: Dados abertos + privacy: Política de privacidade + verify: + code: Código que você recebeu por carta + email: Email + info: 'Para verificar sua conta entre seus dados de acesso:' + info_code: 'Agora entre com o código que você recebeu por carta:' + password: Senha + submit: Verificar minha conta + title: Verificar sua conta + while_unfinished_html: Enquanto terminamos, nós encorajamos você a visitar o Blog da Área de Participação Cidadã, Transparência + e Governo Aberto para saber de nossos progressos e notícias; ou a Seção + de Participação Cidadã onde você poderá decidir qual é a cidade que você + quer. + proposals: + create: + form: + submit_button: Criar proposta + edit: + editing: Editar proposta + form: + submit_button: Salvar alterações + show_link: Visualizar proposta + form: + proposal_external_url: Link para documentação adicional + proposal_question: Questão proposta + proposal_question_example_html: 'Precisa ser sumarizado em uma questão com resposta + Sim ou Não. Ex.: ''Você concorda com a mudança da Calle Mayor como via + exclusiva de pedestres?''' + proposal_responsible_name: Nome completo da pessoa que está submetendo a proposta + proposal_responsible_name_note: "(indivudualmente ou como representante de um + coletivo; não será mostrado publicamente)" + proposal_summary: Sumário da proposta + proposal_summary_note: "(máximo de 200 caracteres)" + proposal_text: Texto da proposta + proposal_title: Título da proposta + proposal_video_url: Link para vídeo externo + proposal_video_url_note: Você pode adicionar um link para o Youtube ou Vimeo + tag_category_label: Categorias + tags_instructions: Marque esta proposta. Você pode escolher entre as categorias + propostas ou adicionar a sua própria + tags_label: Marcação + tags_placeholder: Entre com as marcações que você deseja usar, separadas por + vírgulas ('s") + index: + featured_proposals: Destacado + filter_topic: + one: " com tópico '%{topic}'" + other: " com tópicos '%{topic}'" + orders: + confidence_score: melhor avaliado + created_at: mais recente + hot_score: mais ativa + most_commented: mais comentada + relevance: relevância + search_form: + button: Buscar + placeholder: Buscar propostas... + title: Buscar + search_results: + one: " contendo o termo '%{search_term}'" + other: " contendo os termos '%{search_term}'" + select_order: Ordenado por + select_order_long: 'Você está vendo propostas de acordo para:' + start_proposal: Criar proposta + title: Propostas + new: + form: + submit_button: Criar proposta + more_info: Como funciona as propostas cidadãs? + recommendation_one: Não use letras maiúsculas para o título de sua proposta + ou em sentenças completas. Na internet, isto é considerado gritaria. E ninguém + gosta de ouvir em gritos. + recommendations_title: Recomendações para criação de uma proposta + recommendation_three: Aproveite este espaço e as vozes que o preenchem. Ele + pertence a você também. + recommendation_two: Qualquer proposta ou comentário sugerindo uma ação ilegal + será apagado, assim como aqueles intencionados em sabotar os espaços de debate. + Tudo mais será permitido. + start_new: Criar nova proposta + proposal: + already_supported: Você já apoiou esta proposta. Compartilhe! + comments: + one: 1 comentário + other: "%{count} comentários" + zero: Nenhum comentário + proposal: Proposta + reason_for_supports_necessary: 2% do Censo + support: Apoiar + supports: + one: 1 apoio + other: "%{count} apoios" + zero: Nenhum apoio + supports_necessary: "%{number} apoios necessários" + support_title: Apoiar esta proposta + total_percent: 100% + show: + author_deleted: Usuário apagado + code: 'Código da proposta:' + comments: + one: 1 comentário + other: "%{count} comentários" + zero: Nenhum comentário + edit_proposal_link: Editar + flag: Esta proposta já foi marcada como inadequada por vários usuários. + login_to_comment: Você precisa %{signin} ou %{signup} para deixar um comentário + share: Compartilhar + update: + form: + submit_button: Salvar alterações + settings: + email_domain_for_officials: Domínio de email para coordenadores públicos + feature: + debates: Debates + spending_proposals: Propostas de despesa + max_ratio_anon_votes_on_debates: Máxima razão de votos anônimos por Debate + max_votes_for_debate_edit: Número de votos no qual um Debate não pode mais ser + editado + max_votes_for_proposal_edit: Número de votos no qual uma Proposta não pode mais + ser editada + official_level_1_name: Nível 1 coordenador público + official_level_2_name: Nível 2 coordenador público + official_level_3_name: Nível 3 coordenador público + official_level_4_name: Nível 4 coordenador público + official_level_5_name: Nível 5 coordenador público + per_page_code: Código a ser incluído em cada página + proposal_code_prefix: Prefixo para códigos de Proposta + votes_for_proposal_success: Número de votos necessários para aprovar uma Proposta + shared: + advanced_search: + author_type: Por categoria de autor + author_type_1: Servidor público + author_type_2: Organização municipal + author_type_3: Diretor geral + author_type_4: Conselheiro municipal + author_type_5: Prefeita + author_type_blank: Selecione um categoria + date: Por data + date_1: "Últimas 24 horas" + date_2: "Última semana" + date_3: "Último mês" + date_4: "Último ano" + date_5: Personalizado + date_placeholder: DD/MM/AAAA + date_range_blank: Escolha uma data + from: De + general: Com o texto + general_placeholder: Escrever o texto + search: Filtro + title: Busca avançada + to: Para + author_info: + author_deleted: Usuário apagado + check: Selecionar + check_all: Todos + check_none: Nenhum + collective: Coletivo + flag: Marcar como inapropriado + print: + print_button: Imprimir esta informação + tags_cloud: + categories: Categorias + districts: Distritos + tags: Tendências + unflag: Desmarcar + social: + blog: Blog + facebook: Facebook + twitter: Twitter + youtube: YouTube + social_share_button: + baidu: Baidu.com + delicious: Delicious + douban: Douban + email: Email + facebook: Facebook + google_bookmark: Marcações do Google + google_plus: Google+ + kaixin001: Kaixin001.com + pinterest: Pinterest + plurk: Plurk + qq: Qzone + renren: Renren.com + share_to: Compartilhar com %{name} + tqq: Tqq + tumblr: Tumblr + twitter: Twitter + weibo: Sina Weibo + spending_proposals: + form: + description: Descrição + external_url: Link para documentação adicional + geozone: Escopo da operação + submit_buttons: + create: Criar + new: Criar + title: Título da proposta de despesa + index: + title: Orçamento participativo + new: + back_link: Voltar + more_info: Como funciona o orçamento participativo? + recommendation_one: "É mandatório que a proposta faça referência a uma ação + orçamentária." + recommendations_title: Como criar uma proposta de despesa + recommendation_three: Tente descer aos detalhes quando descrever sua proposta + de despesa de maneira a ajudar a equipe de revisão entender seu argumento. + recommendation_two: Qualquer proposta ou comentário sugerindo ações ilegais + serão apagadas. + start_new: Criar uma proposta de despesa + support: + array: + last_word_connector: ", e" + two_words_connector: e + words_connector: "," + time: + am: am + formats: + datetime: "%Y-%m-%d %H:%M:%S" + default: "%a, %d %b %Y %H:%M:%S %z" + long: "%B %d, %Y %H:%M" + short: "%d %b %H:%M" + pm: pm + unauthorized: + default: Você não possui permissão de acesso a esta página. + manage: + all: Você não possui permissão para executar esta ação '%{action}' em %{subject}. + users: + show: + deleted: Apagado + deleted_debate: Este debate foi apagado + deleted_proposal: Esta proposta foi apagado + filters: + comments: + one: 1 Comentário + other: "%{count} Comentários" + debates: + one: 1 Debate + other: "%{count} Debates" + proposals: + one: 1 Proposta + other: "%{count} Propostas" + no_activity: Usuário não possui atividade pública + private_activity: Este usuário decidiu manter a lista de atividades privada + verification: + alert: + lock: Você atingiu o número máximo de tentativas. Por favor tente novamente + mais tarde. + back: Voltar para minha conta. + email: + create: + alert: + failure: Houve um problema com o envio de um email para sua conta + flash: + success: 'Enviamos um email de confirmação para sua conta: %{email}' + show: + alert: + failure: Código de verificação incorreto + flash: + success: Você é um usuário verificado + letter: + alert: + unconfirmed_code: Você ainda não entrou com o código de confirmação + create: + flash: + offices: Escritórios de Apoio ao Cidadão + offices_url: http://www.madrid.es/portales/munimadrid/es/Inicio/El-Ayuntamiento/Atencion-al-ciudadano/Oficinas-de-Atencion-al-Ciudadano?vgnextfmt=default&vgnextchannel=5b99cde2e09a4310VgnVCM1000000b205a0aRCRD + success_html: Obrigado por solicitar seu código de segurança máxima (somente + solicitado em votações finais). Em poucos dias nós lhe enviaremos + para seu endereço relacionado nos dados que temos em arquivo. Por favor + lembre-se que, se você prefere. você pode coletar seu código em qualquer + dos %{offices}. + edit: + see_all: Ver propostas + title: Carte solicitada + errors: + incorrect_code: Código de verificação incorreto + new: + explanation: 'Para participar na votação final você pode:' + go_to_index: Ver propostas + office: Verificar em qualquer %{office} + offices: Escritórios de Apoio ao Cidadão + offices_url: http://www.madrid.es/portales/munimadrid/es/Inicio/El-Ayuntamiento/Atencion-al-ciudadano/Oficinas-de-Atencion-al-Ciudadano?vgnextfmt=default&vgnextchannel=5b99cde2e09a4310VgnVCM1000000b205a0aRCRD + send_letter: Envie-me uma carta com o código + title: Parabéns! + user_permission_info: Com a sua conta você pode... + update: + flash: + success: Código correto. Sua conta está agora verificada + redirect_notices: + already_verified: Sua conta já foi verificada + email_already_sent: Nós já enviamos um email com o link de confirmação. Se você + não consegue localizar este email, você pode solicitar o reenvio aqui + residence: + alert: + unconfirmed_residency: Você ainda não confirmou sua residência + create: + flash: + success: Residência verificada + new: + accept_terms_text: Eu aceito %{terms_url} do Censo + date_of_birth: Data de nascimento + document_number: Numero do documento + document_type_label: Tipo do documento + document_type: + passport: Passaporte + residence_card: Cartão de residência + spanish_id: DNI + error_not_allowed_age: Você precisa ter pelo menos 16 anos de idade + error_not_allowed_postal_code: Para ser verificado, você precisa estar registrado + na municipalidade de Madrid + error_verifying_census: O Censo de Madrid não conseguiu verificar sua informação. + Por favor confirme que seus detalhes censitários são corretos ligando para + 010 (or 915298210) ou visite qualquer dos %{offices}. + error_verifying_census_offices: 26 Escritórios de Cidadania + form_errors: interditado a verificação de sua residência + postal_code: Código postal + postal_code_note: Para verificar sua conta você precisa estar no Censo da + cidade de Madrid + terms: os termos e condições de acesso + title: Verificar residência + verify_residence: Verificar residência + sms: + create: + flash: + success: Entrar o código de verificação enviado para você por mensagem de + texto + edit: + confirmation_code: Entrar o código que você recebeu em seu celular + resend_sms_link: Clique aqui para enviá-lo novamente + resend_sms_text: Você não recebeu um texto com seu código de confirmação + submit_button: Enviar + title: Confirmação de código de segurança + new: + phone: Entre seu número de celular para receber o código + phone_format_html: "(Examplo: 612345678)" + phone_note: Nós somente utilizamos seu telefone para enviar-lhe um código, + nós nunca entramos em contato com você. + phone_placeholder: 'Examplo: 612345678' + submit_button: Enviar + title: Enviar código de confirmação + update: + error: Código de confirmação incorreto + flash: + level_three: + success: Código correto. Sua conta está agora verificada + level_two: + success: Código correto + step_1: Residência + step_2: Código de confirmaçnao + step_3: Verificação final + user_permission_debates: Participar em debates + user_permission_info: Verificando sua informação você será capaz de... + user_permission_proposal: Criar novas propostas + user_permission_support_proposal: Apoiar propostas* + user_permission_votes: Participar na votação final + verified_user: + form: + submit_button: Enviar código + show: + email_title: Emails + explanation: 'Nós atualmente possuímos os seguintes detalhes no Registro: + por favor selecione um método para o envio de seu código de confirmação.' + phone_title: Números de telefone + title: Informação disponível + use_another_phone: Usar outro telefone + views: + pagination: + first: "« Primeiro" + last: "Último »" + next: Próximo › + previous: "‹ Anterior" + truncate: "…" + votes: + agree: Eu concordo + anonymous: Excesso de votos anônimos para admitir voto %{verify_account} + disagree: Eu discordo + organizations: Organizações não tem permissão de voto + signin: Iniciar sessão + signup: Inscrever + supports: Apoios + unauthenticated: Você precisa %{signin} ou %{signup} para continuar + verified_only: Somente usuários verificados podem votar em propostas; %{verify_account}. + verify_account: verificar sua conta + welcome: + debates: + alt: "Ícone debates" + description: Para encontros, discussões e compartilhamento de coisas que importam + para nós em nossa cidade. + title: Debates + decide: + alt: "Ícone decide" + description: O público decide se ele aceita ou rejeita as propostas mais apoiadas. + title: Você decide + do: + alt: "Ícone isto está feito" + description: Se a proposta é aceita pela maioria, a Câmara Municipal a aceita + como dela e a ação é realizada. + title: Isto está feito + featured: + proposals: + link: Mostrar propostas + text: Criar suas próprias propostas e apoiar aquelas de outros cidadãos + title: Propostas cidadãs + more_information: Mais informações sobre esta página + proposal: + alt: "Ícone proposta" + description: Espaço aberto para propostas cidadãs sobre o tipo de cidade dentro + da qual nós queremos viver. + title: Sua proposta + welcome: + go_to_index: Veja propostas e debates + title: Participar + user_permission_debates: Participar nos debates + user_permission_info: Com a sua conta você pode... + user_permission_proposal: Criar novas propostas + user_permission_support_proposal: Apoiar propostas* + user_permission_verify: Para executar todas as ações %{verify} + user_permission_verify_info: "* Somente usuários no Censo de Madrid" + user_permission_votes: Participar na votação final From b7e3129ec1a8172d1a9b55c5d5e991cf33c33e59 Mon Sep 17 00:00:00 2001 From: rgarcia Date: Thu, 16 Jun 2016 18:35:34 +0200 Subject: [PATCH 072/126] uses more efficient count --- app/controllers/admin/stats_controller.rb | 6 +++--- app/views/admin/stats/direct_messages.html.erb | 4 ++-- app/views/admin/stats/proposal_notifications.html.erb | 4 ++-- 3 files changed, 7 insertions(+), 7 deletions(-) diff --git a/app/controllers/admin/stats_controller.rb b/app/controllers/admin/stats_controller.rb index 8cc5d712c..5543a2d1f 100644 --- a/app/controllers/admin/stats_controller.rb +++ b/app/controllers/admin/stats_controller.rb @@ -25,11 +25,11 @@ class Admin::StatsController < Admin::BaseController def proposal_notifications @proposal_notifications = ProposalNotification.all - @proposals_with_notifications = @proposal_notifications.pluck(:proposal_id).uniq + @proposals_with_notifications = @proposal_notifications.distinct.count(:proposal_id) end def direct_messages - @direct_messages = DirectMessage.all - @users_who_have_sent_message = DirectMessage.pluck(:sender_id).uniq + @direct_messages = DirectMessage.count + @users_who_have_sent_message = DirectMessage.distinct.count(:sender_id) end end diff --git a/app/views/admin/stats/direct_messages.html.erb b/app/views/admin/stats/direct_messages.html.erb index 432152db5..b87e2b3e3 100644 --- a/app/views/admin/stats/direct_messages.html.erb +++ b/app/views/admin/stats/direct_messages.html.erb @@ -7,14 +7,14 @@

<%= t("admin.stats.direct_messages.total") %>
- <%= @direct_messages.count %> + <%= @direct_messages %>

<%= t("admin.stats.direct_messages.users_who_have_sent_message") %>
- <%= @users_who_have_sent_message.count %> + <%= @users_who_have_sent_message %>

diff --git a/app/views/admin/stats/proposal_notifications.html.erb b/app/views/admin/stats/proposal_notifications.html.erb index 75b1c04f5..79e19a247 100644 --- a/app/views/admin/stats/proposal_notifications.html.erb +++ b/app/views/admin/stats/proposal_notifications.html.erb @@ -7,14 +7,14 @@

<%= t("admin.stats.proposal_notifications.total") %>
- <%= @proposal_notifications.count %> + <%= @proposal_notifications %>

<%= t("admin.stats.proposal_notifications.proposals_with_notifications") %>
- <%= @proposals_with_notifications.count %> + <%= @proposals_with_notifications %>

From 3c2098eb1400deef8bd4eb729fc710517d33448c Mon Sep 17 00:00:00 2001 From: rgarcia Date: Thu, 16 Jun 2016 18:40:05 +0200 Subject: [PATCH 073/126] improves legibility of counts --- app/controllers/admin/stats_controller.rb | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/app/controllers/admin/stats_controller.rb b/app/controllers/admin/stats_controller.rb index 5543a2d1f..7e5b902e9 100644 --- a/app/controllers/admin/stats_controller.rb +++ b/app/controllers/admin/stats_controller.rb @@ -25,11 +25,11 @@ class Admin::StatsController < Admin::BaseController def proposal_notifications @proposal_notifications = ProposalNotification.all - @proposals_with_notifications = @proposal_notifications.distinct.count(:proposal_id) + @proposals_with_notifications = @proposal_notifications.select(:proposal_id).distinct.count end def direct_messages @direct_messages = DirectMessage.count - @users_who_have_sent_message = DirectMessage.distinct.count(:sender_id) + @users_who_have_sent_message = DirectMessage.select(:sender_id).distinct.count end end From 74282bb0d7981e4099b8ddc651f21ad19ece68f2 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Juanjo=20Baz=C3=A1n?= Date: Fri, 17 Jun 2016 11:58:53 +0200 Subject: [PATCH 074/126] updates ruby version to 2.3.1 --- .ruby-version | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.ruby-version b/.ruby-version index 276cbf9e2..2bf1c1ccf 100644 --- a/.ruby-version +++ b/.ruby-version @@ -1 +1 @@ -2.3.0 +2.3.1 From 18354587ab371f199f023eff63837f52fef61e49 Mon Sep 17 00:00:00 2001 From: rgarcia Date: Fri, 17 Jun 2016 15:47:23 +0200 Subject: [PATCH 075/126] force travis restart --- .ruby-version | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.ruby-version b/.ruby-version index 2bf1c1ccf..a6254504e 100644 --- a/.ruby-version +++ b/.ruby-version @@ -1 +1 @@ -2.3.1 +2.3.1 \ No newline at end of file From 3299b595aa888804b0027b498d57830868c32a30 Mon Sep 17 00:00:00 2001 From: Alberto Garcia Cabeza Date: Mon, 20 Jun 2016 16:28:56 +0200 Subject: [PATCH 076/126] Adds info text on proposal notification digest --- app/views/mailer/proposal_notification_digest.html.erb | 6 +++++- config/locales/mailers.en.yml | 1 + config/locales/mailers.es.yml | 1 + 3 files changed, 7 insertions(+), 1 deletion(-) diff --git a/app/views/mailer/proposal_notification_digest.html.erb b/app/views/mailer/proposal_notification_digest.html.erb index 0b839150f..1a0ef1468 100644 --- a/app/views/mailer/proposal_notification_digest.html.erb +++ b/app/views/mailer/proposal_notification_digest.html.erb @@ -3,10 +3,14 @@ -

+

<%= t('mailers.proposal_notification_digest.title', org_name: Setting['org_name']) %>

+

+ <%= t('mailers.proposal_notification_digest.info', + org_name: Setting['org_name']) %> +

diff --git a/config/locales/mailers.en.yml b/config/locales/mailers.en.yml index c2e2b5d85..100955cab 100755 --- a/config/locales/mailers.en.yml +++ b/config/locales/mailers.en.yml @@ -32,6 +32,7 @@ en: subject: "Your investment project '%{code}' has been marked as unfeasible" unfeasible_html: "From the Madrid City Council we want to thank you for your participation in the participatory budgets of the city of Madrid. We regret to inform you that your proposal '%{title}' will be excluded from this participatory process for the following reason:" proposal_notification_digest: + info: "Here are the new notifications that have published the authors of the proposals that your are supporting in %{org_name}." title: "Proposal notifications in %{org_name}" share: Share proposal comment: Comment proposal diff --git a/config/locales/mailers.es.yml b/config/locales/mailers.es.yml index d90636c32..2a7a85013 100644 --- a/config/locales/mailers.es.yml +++ b/config/locales/mailers.es.yml @@ -32,6 +32,7 @@ es: subject: "Tu propuesta de inversión '%{code}' ha sido marcada como inviable" unfeasible_html: "Desde el Ayuntamiento de Madrid queremos agradecer tu participación en los Presupuestos Participativos de la ciudad de Madrid. Lamentamos informarte de que tu propuesta '%{title}' quedará excluida de este proceso participativo por el siguiente motivo:" proposal_notification_digest: + info: "A continuación te mostramos las nuevas notificaciones que han publicado los autores de las propuestas que estás apoyando en %{org_name}." title: "Notificaciones de propuestas en %{org_name}" share: Compartir propuesta comment: Comentar propuesta From ecd9d514afc13b8c339497f9c495141d7bea516c Mon Sep 17 00:00:00 2001 From: Alberto Garcia Cabeza Date: Mon, 20 Jun 2016 16:33:08 +0200 Subject: [PATCH 077/126] Improves translation --- config/locales/mailers.en.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/config/locales/mailers.en.yml b/config/locales/mailers.en.yml index 100955cab..17e3f6cf8 100755 --- a/config/locales/mailers.en.yml +++ b/config/locales/mailers.en.yml @@ -32,7 +32,7 @@ en: subject: "Your investment project '%{code}' has been marked as unfeasible" unfeasible_html: "From the Madrid City Council we want to thank you for your participation in the participatory budgets of the city of Madrid. We regret to inform you that your proposal '%{title}' will be excluded from this participatory process for the following reason:" proposal_notification_digest: - info: "Here are the new notifications that have published the authors of the proposals that your are supporting in %{org_name}." + info: "Here are the new notifications that have been published by authors of the proposals that you have supported in %{org_name}." title: "Proposal notifications in %{org_name}" share: Share proposal comment: Comment proposal From 98040e191ef04721eea038f838596c5f342bee2a Mon Sep 17 00:00:00 2001 From: rgarcia Date: Fri, 17 Jun 2016 19:40:30 +0200 Subject: [PATCH 078/126] fixes conflicts with fork --- app/controllers/account_controller.rb | 2 +- app/views/account/show.html.erb | 11 +++++++++++ config/locales/en.yml | 1 + config/locales/es.yml | 1 + db/migrate/20160617172616_add_badge_to_users.rb | 5 +++++ db/schema.rb | 3 ++- spec/features/account_spec.rb | 2 ++ spec/models/user_spec.rb | 6 ++++++ 8 files changed, 29 insertions(+), 2 deletions(-) create mode 100644 db/migrate/20160617172616_add_badge_to_users.rb diff --git a/app/controllers/account_controller.rb b/app/controllers/account_controller.rb index 9212eb4fa..c3d814b38 100644 --- a/app/controllers/account_controller.rb +++ b/app/controllers/account_controller.rb @@ -25,7 +25,7 @@ class AccountController < ApplicationController if @account.organization? params.require(:account).permit(:phone_number, :email_on_comment, :email_on_comment_reply, :newsletter, organization_attributes: [:name, :responsible_name]) else - params.require(:account).permit(:username, :public_activity, :email_on_comment, :email_on_comment_reply, :email_on_direct_message, :email_digest, :newsletter) + params.require(:account).permit(:username, :public_activity, :email_on_comment, :email_on_comment_reply, :email_on_direct_message, :email_digest, :newsletter, :official_position_badge) end end diff --git a/app/views/account/show.html.erb b/app/views/account/show.html.erb index 98987626d..deaa4c889 100644 --- a/app/views/account/show.html.erb +++ b/app/views/account/show.html.erb @@ -87,6 +87,17 @@ <% end %>
+
+ <%= f.label :official_position_badge do %> + <%= f.check_box :official_position_badge, + title: t('account.show.official_position_badge_label'), + label: false %> + + <%= t("account.show.official_position_badge_label") %> + + <% end %> +
+ <%= f.submit t("account.show.save_changes_submit"), class: "button" %>
diff --git a/config/locales/en.yml b/config/locales/en.yml index b16f1092a..608e0efab 100755 --- a/config/locales/en.yml +++ b/config/locales/en.yml @@ -17,6 +17,7 @@ en: subscription_to_website_newsletter_label: Receive by email website relevant information email_on_direct_message_label: Receive emails about direct messages email_digest_label: Receive a summary of proposal notifications + official_position_badge_label: Show official position badge title: My account user_permission_debates: Participate on debates user_permission_info: With your account you can... diff --git a/config/locales/es.yml b/config/locales/es.yml index 620499ace..9678ed5c1 100755 --- a/config/locales/es.yml +++ b/config/locales/es.yml @@ -17,6 +17,7 @@ es: subscription_to_website_newsletter_label: Recibir emails con información interesante sobre la web email_on_direct_message_label: Recibir emails con mensajes privados email_digest_label: Recibir resumen de notificaciones sobre propuestas + official_position_badge_label: Mostrar etiqueta de tipo de usuario title: Mi cuenta user_permission_debates: Participar en debates user_permission_info: Con tu cuenta ya puedes... diff --git a/db/migrate/20160617172616_add_badge_to_users.rb b/db/migrate/20160617172616_add_badge_to_users.rb new file mode 100644 index 000000000..2f634aa49 --- /dev/null +++ b/db/migrate/20160617172616_add_badge_to_users.rb @@ -0,0 +1,5 @@ +class AddBadgeToUsers < ActiveRecord::Migration + def change + add_column :users, :official_position_badge, :boolean, default: false + end +end diff --git a/db/schema.rb b/db/schema.rb index f5671b3a3..6932611e4 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: 20160614160949) do +ActiveRecord::Schema.define(version: 20160617172616) do # These are extensions that must be enabled in order to support this database enable_extension "plpgsql" @@ -462,6 +462,7 @@ ActiveRecord::Schema.define(version: 20160614160949) do t.boolean "email_on_proposal_notification", default: true t.boolean "email_digest", default: true t.boolean "email_on_direct_message", default: true + t.boolean "official_position_badge", default: false end add_index "users", ["confirmation_token"], name: "index_users_on_confirmation_token", unique: true, using: :btree diff --git a/spec/features/account_spec.rb b/spec/features/account_spec.rb index 0d5da38b2..604872a58 100644 --- a/spec/features/account_spec.rb +++ b/spec/features/account_spec.rb @@ -37,6 +37,7 @@ feature 'Account' do check 'account_email_on_comment_reply' uncheck 'account_email_digest' uncheck 'account_email_on_direct_message' + check 'account_official_position_badge' click_button 'Save changes' expect(page).to have_content "Changes saved" @@ -48,6 +49,7 @@ feature 'Account' do expect(find("#account_email_on_comment_reply")).to be_checked expect(find("#account_email_digest")).to_not be_checked expect(find("#account_email_on_direct_message")).to_not be_checked + expect(find("#account_official_position_badge")).to be_checked end scenario 'Edit Organization' do diff --git a/spec/models/user_spec.rb b/spec/models/user_spec.rb index 143053c77..41455eb1d 100644 --- a/spec/models/user_spec.rb +++ b/spec/models/user_spec.rb @@ -95,6 +95,12 @@ describe User do expect(subject.email_on_direct_message).to eq(true) end end + + describe 'official_position_badge' do + it 'should be false by default' do + expect(subject.official_position_badge).to eq(false) + end + end end describe "administrator?" do From 51d688897aba29b5993317c465a714723db7bf27 Mon Sep 17 00:00:00 2001 From: rgarcia Date: Mon, 20 Jun 2016 21:07:32 +0200 Subject: [PATCH 079/126] displays badge option if official position is level 1 --- app/views/account/show.html.erb | 22 +++++++++++---------- spec/features/account_spec.rb | 35 +++++++++++++++++++++++++++++++-- 2 files changed, 45 insertions(+), 12 deletions(-) diff --git a/app/views/account/show.html.erb b/app/views/account/show.html.erb index deaa4c889..247aa6024 100644 --- a/app/views/account/show.html.erb +++ b/app/views/account/show.html.erb @@ -87,16 +87,18 @@ <% end %>
-
- <%= f.label :official_position_badge do %> - <%= f.check_box :official_position_badge, - title: t('account.show.official_position_badge_label'), - label: false %> - - <%= t("account.show.official_position_badge_label") %> - - <% end %> -
+ <% if @account.official_level == 1 %> +
+ <%= f.label :official_position_badge do %> + <%= f.check_box :official_position_badge, + title: t('account.show.official_position_badge_label'), + label: false %> + + <%= t("account.show.official_position_badge_label") %> + + <% end %> +
+ <% end %> <%= f.submit t("account.show.save_changes_submit"), class: "button" %>
diff --git a/spec/features/account_spec.rb b/spec/features/account_spec.rb index 604872a58..d1c547185 100644 --- a/spec/features/account_spec.rb +++ b/spec/features/account_spec.rb @@ -37,7 +37,6 @@ feature 'Account' do check 'account_email_on_comment_reply' uncheck 'account_email_digest' uncheck 'account_email_on_direct_message' - check 'account_official_position_badge' click_button 'Save changes' expect(page).to have_content "Changes saved" @@ -49,7 +48,6 @@ feature 'Account' do expect(find("#account_email_on_comment_reply")).to be_checked expect(find("#account_email_digest")).to_not be_checked expect(find("#account_email_on_direct_message")).to_not be_checked - expect(find("#account_official_position_badge")).to be_checked end scenario 'Edit Organization' do @@ -71,6 +69,39 @@ feature 'Account' do expect(find("#account_email_on_comment_reply")).to be_checked end + context "Option to display badge for official position" do + + scenario "Users with official position of level 1" do + official_user = create(:user, official_level: 1) + + login_as(official_user) + visit account_path + + check 'account_official_position_badge' + click_button 'Save changes' + expect(page).to have_content "Changes saved" + + visit account_path + expect(find("#account_official_position_badge")).to be_checked + end + + scenario "Users with official position of level 2 and above" do + official_user2 = create(:user, official_level: 2) + official_user3 = create(:user, official_level: 3) + + login_as(official_user2) + visit account_path + + expect(page).to_not have_css '#account_official_position_badge' + + login_as(official_user3) + visit account_path + + expect(page).to_not have_css '#account_official_position_badge' + end + + end + scenario "Errors on edit" do visit account_path From 9e910a834baeddb31da012f78dde85dad542a655 Mon Sep 17 00:00:00 2001 From: rgarcia Date: Mon, 20 Jun 2016 21:08:49 +0200 Subject: [PATCH 080/126] Displays badge for official positions --- app/models/user.rb | 15 ++- app/views/comments/_comment.html.erb | 2 +- app/views/debates/_debate.html.erb | 2 +- app/views/proposals/_proposal.html.erb | 2 +- app/views/proposals/summary.html.erb | 2 +- app/views/shared/_author_info.html.erb | 2 +- .../_spending_proposal.html.erb | 2 +- spec/features/official_positions_spec.rb | 97 +++++++++++++++++++ spec/models/user_spec.rb | 36 +++++++ spec/support/common_actions.rb | 14 +++ 10 files changed, 163 insertions(+), 11 deletions(-) create mode 100644 spec/features/official_positions_spec.rb diff --git a/app/models/user.rb b/app/models/user.rb index 7240c8929..4bb09c4a0 100644 --- a/app/models/user.rb +++ b/app/models/user.rb @@ -133,6 +133,16 @@ class User < ActiveRecord::Base update official_position: nil, official_level: 0 end + def has_official_email? + domain = Setting['email_domain_for_officials'] + !email.blank? && ( (email.end_with? "@#{domain}") || (email.end_with? ".#{domain}") ) + end + + def display_official_position_badge? + return true if official_level > 1 + official_position_badge? && official_level == 1 + end + def block debates_ids = Debate.where(author_id: id).pluck(:id) comments_ids = Comment.where(user_id: id).pluck(:id) @@ -197,11 +207,6 @@ class User < ActiveRecord::Base !erased? end - def has_official_email? - domain = Setting['email_domain_for_officials'] - !email.blank? && ( (email.end_with? "@#{domain}") || (email.end_with? ".#{domain}") ) - end - def locale self[:locale] ||= I18n.default_locale.to_s end diff --git a/app/views/comments/_comment.html.erb b/app/views/comments/_comment.html.erb index 0e88614c5..7b5ff4b7d 100644 --- a/app/views/comments/_comment.html.erb +++ b/app/views/comments/_comment.html.erb @@ -36,7 +36,7 @@ <%= t("comments.comment.user_deleted") %> <% else %> <%= link_to comment.user.name, user_path(comment.user) %> - <% if comment.user.official? %> + <% if comment.user.display_official_position_badge? %>  •  <%= comment.user.official_position %> diff --git a/app/views/debates/_debate.html.erb b/app/views/debates/_debate.html.erb index c9807041b..09d7d79c0 100644 --- a/app/views/debates/_debate.html.erb +++ b/app/views/debates/_debate.html.erb @@ -24,7 +24,7 @@ <%= debate.author.name %> - <% if debate.author.official? %> + <% if debate.author.display_official_position_badge? %>  •  <%= debate.author.official_position %> diff --git a/app/views/proposals/_proposal.html.erb b/app/views/proposals/_proposal.html.erb index e1e5d36a0..70c2b9c89 100644 --- a/app/views/proposals/_proposal.html.erb +++ b/app/views/proposals/_proposal.html.erb @@ -26,7 +26,7 @@ <%= proposal.author.name %> - <% if proposal.author.official? %> + <% if proposal.author.display_official_position_badge? %>  •  <%= proposal.author.official_position %> diff --git a/app/views/proposals/summary.html.erb b/app/views/proposals/summary.html.erb index 05ed7dac9..38c56c963 100644 --- a/app/views/proposals/summary.html.erb +++ b/app/views/proposals/summary.html.erb @@ -20,7 +20,7 @@ <%= t("proposals.show.author_deleted") %> <% else %> <%= proposal.author.name %> - <% if proposal.author.official? %> + <% if proposal.author.display_official_position_badge? %> <%= proposal.author.official_position %> diff --git a/app/views/shared/_author_info.html.erb b/app/views/shared/_author_info.html.erb index 1a0315341..d61317321 100644 --- a/app/views/shared/_author_info.html.erb +++ b/app/views/shared/_author_info.html.erb @@ -15,7 +15,7 @@ <% end %> - <% if resource.author.official? %> + <% if resource.author.display_official_position_badge? %>  •  <%= resource.author.official_position %> diff --git a/app/views/spending_proposals/_spending_proposal.html.erb b/app/views/spending_proposals/_spending_proposal.html.erb index af59def70..2854353bb 100644 --- a/app/views/spending_proposals/_spending_proposal.html.erb +++ b/app/views/spending_proposals/_spending_proposal.html.erb @@ -23,7 +23,7 @@ <%= spending_proposal.author.name %> - <% if spending_proposal.author.official? %> + <% if spending_proposal.author.display_official_position_badge? %>  •  <%= spending_proposal.author.official_position %> diff --git a/spec/features/official_positions_spec.rb b/spec/features/official_positions_spec.rb new file mode 100644 index 000000000..01f78370a --- /dev/null +++ b/spec/features/official_positions_spec.rb @@ -0,0 +1,97 @@ +require 'rails_helper' + +feature 'Official positions' do + + context "Badge" do + + background do + @user1 = create(:user, official_level: 1, official_position: "Employee", official_position_badge: true) + @user2 = create(:user, official_level: 0, official_position: "") + end + + scenario "Comments" do + proposal = create(:proposal) + comment1 = create(:comment, commentable: proposal, user: @user1) + comment2 = create(:comment, commentable: proposal, user: @user2) + + visit proposal_path(proposal) + + expect_badge_for("comment", comment1) + expect_no_badge_for("comment", comment2) + end + + context "Debates" do + + background do + @debate1 = create(:debate, author: @user1) + @debate2 = create(:debate, author: @user2) + end + + scenario "Index" do + visit debates_path + + expect_badge_for("debate", @debate1) + expect_no_badge_for("debate", @debate2) + end + + scenario "Show" do + visit debate_path(@debate1) + expect_badge_for("debate", @debate1) + + visit debate_path(@debate2) + expect_no_badge_for("debate", @debate2) + end + + end + + context "Proposals" do + + background do + @proposal1 = create(:proposal, author: @user1) + @proposal2 = create(:proposal, author: @user2) + + featured_proposals = 3.times { create(:proposal) } + end + + scenario "Index" do + visit proposals_path + + expect_badge_for("proposal", @proposal1) + expect_no_badge_for("proposal", @proposal2) + end + + scenario "Show" do + visit proposal_path(@proposal1) + expect_badge_for("proposal", @proposal1) + + visit proposal_path(@proposal2) + expect_no_badge_for("proposal", @proposal2) + end + + end + + context "Spending proposals" do + + background do + @spending_proposal1 = create(:spending_proposal, author: @user1) + @spending_proposal2 = create(:spending_proposal, author: @user2) + end + + scenario "Index" do + visit spending_proposals_path + + expect_badge_for("spending_proposal", @spending_proposal1) + expect_no_badge_for("spending_proposal", @spending_proposal2) + end + + scenario "Show" do + visit spending_proposal_path(@spending_proposal1) + expect_badge_for("spending_proposal", @spending_proposal1) + + visit spending_proposal_path(@spending_proposal2) + expect_no_badge_for("spending_proposal", @spending_proposal2) + end + + end + end +end \ No newline at end of file diff --git a/spec/models/user_spec.rb b/spec/models/user_spec.rb index 41455eb1d..c56e7a115 100644 --- a/spec/models/user_spec.rb +++ b/spec/models/user_spec.rb @@ -289,6 +289,42 @@ describe User do end end + describe "official_position_badge" do + + describe "Users of level 1" do + + it "displays the badge if set in preferences" do + user = create(:user, official_level: 1, official_position_badge: true) + + expect(user.display_official_position_badge?).to eq true + end + + it "does not display the badge if set in preferences" do + user = create(:user, official_level: 1, official_position_badge: false) + + expect(user.display_official_position_badge?).to eq false + end + + end + + describe "Users higher than level 1" do + + it "displays the badge regardless of preferences" do + user1 = create(:user, official_level: 2, official_position_badge: false) + user2 = create(:user, official_level: 3, official_position_badge: false) + user3 = create(:user, official_level: 4, official_position_badge: false) + user4 = create(:user, official_level: 5, official_position_badge: false) + + expect(user1.display_official_position_badge?).to eq true + expect(user2.display_official_position_badge?).to eq true + expect(user3.display_official_position_badge?).to eq true + expect(user4.display_official_position_badge?).to eq true + end + + end + + end + describe "self.search" do it "find users by email" do user1 = create(:user, email: "larry@madrid.es") diff --git a/spec/support/common_actions.rb b/spec/support/common_actions.rb index 80bdde907..ca5c7b64a 100644 --- a/spec/support/common_actions.rb +++ b/spec/support/common_actions.rb @@ -231,4 +231,18 @@ module CommonActions DirectMessage.last end + def expect_badge_for(resource_name, resource) + within("##{resource_name}_#{resource.id}") do + expect(page).to have_css ".label.round" + expect(page).to have_content "Employee" + end + end + + def expect_no_badge_for(resource_name, resource) + within("##{resource_name}_#{resource.id}") do + expect(page).to_not have_css ".label.round" + expect(page).to_not have_content "Employee" + end + end + end From 00dbbd0689f90e97ab65823ddb4783efe8ceebd2 Mon Sep 17 00:00:00 2001 From: rgarcia Date: Mon, 20 Jun 2016 21:54:45 +0200 Subject: [PATCH 081/126] fixes specs (unauthenticated users can view spending proposal show) --- app/controllers/spending_proposals_controller.rb | 2 +- spec/features/spending_proposals_spec.rb | 3 --- 2 files changed, 1 insertion(+), 4 deletions(-) diff --git a/app/controllers/spending_proposals_controller.rb b/app/controllers/spending_proposals_controller.rb index 3f590f414..5f8b04717 100644 --- a/app/controllers/spending_proposals_controller.rb +++ b/app/controllers/spending_proposals_controller.rb @@ -1,7 +1,7 @@ class SpendingProposalsController < ApplicationController include FeatureFlags - before_action :authenticate_user!, except: [:index] + before_action :authenticate_user!, except: [:index, :show] before_action -> { flash.now[:notice] = flash[:notice].html_safe if flash[:html_safe] && flash[:notice] } load_and_authorize_resource diff --git a/spec/features/spending_proposals_spec.rb b/spec/features/spending_proposals_spec.rb index 8b52bd014..01220ab27 100644 --- a/spec/features/spending_proposals_spec.rb +++ b/spec/features/spending_proposals_spec.rb @@ -178,9 +178,6 @@ feature 'Spending proposals' do end scenario "Show" do - user = create(:user) - login_as(user) - spending_proposal = create(:spending_proposal, geozone: create(:geozone), association_name: 'People of the neighbourhood') From 1f7e86e206736125403dcfdb84ca3d110dbc4e81 Mon Sep 17 00:00:00 2001 From: rgarcia Date: Mon, 20 Jun 2016 22:06:49 +0200 Subject: [PATCH 082/126] fixes specs --- app/views/admin/stats/proposal_notifications.html.erb | 8 ++++++-- 1 file changed, 6 insertions(+), 2 deletions(-) diff --git a/app/views/admin/stats/proposal_notifications.html.erb b/app/views/admin/stats/proposal_notifications.html.erb index 79e19a247..51130424d 100644 --- a/app/views/admin/stats/proposal_notifications.html.erb +++ b/app/views/admin/stats/proposal_notifications.html.erb @@ -7,14 +7,18 @@

<%= t("admin.stats.proposal_notifications.total") %>
- <%= @proposal_notifications %> + + <%= @proposal_notifications.count %> +

<%= t("admin.stats.proposal_notifications.proposals_with_notifications") %>
- <%= @proposals_with_notifications %> + + <%= @proposals_with_notifications %> +

From e01162bc7af49dbd0db5dbf3b0079e69703729b8 Mon Sep 17 00:00:00 2001 From: Alberto Garcia Cabeza Date: Wed, 22 Jun 2016 11:17:27 +0200 Subject: [PATCH 083/126] Changes message for ie alert --- config/locales/en.yml | 2 +- config/locales/es.yml | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/config/locales/en.yml b/config/locales/en.yml index 608e0efab..fb1138a44 100755 --- a/config/locales/en.yml +++ b/config/locales/en.yml @@ -161,7 +161,7 @@ en: application: chrome: Google Chrome firefox: Firefox - ie: We have detected that you are browsing with Internet Explorer. For an enhanced experience, we recommend using %{chrome} or %{firefox}. + ie: We have detected that you are browsing with Internet Explorer. For an enhanced experience, we recommend using %{firefox} or %{chrome}. ie_title: This website is not optimised for your browser footer: accessibility: Accessibility diff --git a/config/locales/es.yml b/config/locales/es.yml index 9678ed5c1..f4a74afbf 100755 --- a/config/locales/es.yml +++ b/config/locales/es.yml @@ -161,7 +161,7 @@ es: application: chrome: Google Chrome firefox: Firefox - ie: Hemos detectado que estás navegando desde Internet Explorer. Para una mejor experiencia te recomendamos utilizar %{chrome} o %{firefox}. + ie: Hemos detectado que estás navegando desde Internet Explorer. Para una mejor experiencia te recomendamos utilizar %{firefox} o %{chrome}. ie_title: Esta web no está optimizada para tu navegador footer: accessibility: Accesibilidad From 0972f5284aa34b2cdffd14dc498cb6880eef7c06 Mon Sep 17 00:00:00 2001 From: Alberto Garcia Cabeza Date: Thu, 23 Jun 2016 13:56:57 +0200 Subject: [PATCH 084/126] Creates new scss file for IE styles --- app/assets/stylesheets/admin.scss | 5 - app/assets/stylesheets/ie.scss | 199 +++++++++++++++++++++++++ app/assets/stylesheets/layout.scss | 17 --- app/views/layouts/application.html.erb | 3 + config/initializers/assets.rb | 1 + 5 files changed, 203 insertions(+), 22 deletions(-) create mode 100644 app/assets/stylesheets/ie.scss diff --git a/app/assets/stylesheets/admin.scss b/app/assets/stylesheets/admin.scss index e99392fc1..cd8241fca 100644 --- a/app/assets/stylesheets/admin.scss +++ b/app/assets/stylesheets/admin.scss @@ -34,9 +34,6 @@ body.admin { } input[type="text"], textarea { - height: 48px\9; - line-height: 48px\9; - margin-bottom: 24px\9; width: 100%; } } @@ -163,8 +160,6 @@ body.admin { font-size: rem-calc(24); padding-right: rem-calc(12); padding-top: rem-calc(4); - padding-left: 12px\9 !important; - padding-right: 12px\9 !important; vertical-align: middle; } diff --git a/app/assets/stylesheets/ie.scss b/app/assets/stylesheets/ie.scss new file mode 100644 index 000000000..2c494747b --- /dev/null +++ b/app/assets/stylesheets/ie.scss @@ -0,0 +1,199 @@ +// Stylesheet for Internet Explorer +// +// Table of Contents +// 01. Global styles +// 02. Admin +// + +// 01. Global styles +// ----------------- + +*, *:before, *:after { + box-sizing: border-box !important; +} + +.show-for-medium-down, +.show-for-medium, +.show-for-small { + display: none !important; +} + +.show-for-large-up, +.hide-for-medium-down { + display: block !important; +} + +.column, .columns { + display: inline-block !important; + float: none !important; + box-sizing: border-box !important; +} + +.small-1, .row .small-1 { width: 7.33333%; } +.small-2, .row .small-2 { width: 15.66667%; } +.small-3, .row .small-3 { width: 24%; } +.small-4, .row .small-4 { width: 32.33333%; } +.small-5, .row .small-5 { width: 40.66667%; } +.small-6, .row .small-6 { width: 49%; } +.small-7, .row .small-7 { width: 57.33333%; } +.small-8, .row .small-8 { width: 65.66667%; } +.small-9, .row .small-9 { width: 74%; } +.small-10, .row .small-10 { width: 82.33333%; } +.small-11, .row .small-11 { width: 90.66667%; } +.small-12, .row .small-12 { width: 99%; } + +.medium-1, .row .medium-1 { width: 7.33333%; } +.medium-2, .row .medium-2 { width: 15.66667%; } +.medium-3, .row .medium-3 { width: 24%; } +.medium-4, .row .medium-4 { width: 32.33333%; } +.medium-5, .row .medium-5 { width: 40.66667%; } +.medium-6, .row .medium-6 { width: 49%; } +.medium-7, .row .medium-7 { width: 57.33333%; } +.medium-8, .row .medium-8 { width: 65.66667%; } +.medium-9, .row .medium-9 { width: 74%; } +.medium-10, .row .medium-10 { width: 82.33333%; } +.medium-11, .row .medium-11 { width: 90.66667%; } +.medium-12, .row .medium-12 { width: 99%; } + +.large-1, .row .large-1 { width: 7.33333%; } +.large-2, .row .large-2 { width: 15.66667%; } +.large-3, .row .large-3 { width: 24%; } +.large-4, .row .large-4 { width: 32.33333%; } +.large-5, .row .large-5 { width: 40.66667%; } +.large-6, .row .large-6 { width: 49%; } +.large-7, .row .large-7 { width: 57.33333%; } +.large-8, .row .large-8 { width: 65.66667%; } +.large-9, .row .large-9 { width: 74%; } +.large-10, .row .large-10 { width: 82.33333%; } +.large-11, .row .large-11 { width: 90.66667%; } +.large-12, .row .large-12 { width: 99%; } + +.row .small-offset-1 { margin-left: 7.33333%; } +.row .small-offset-2 { margin-left: 15.66667%; } +.row .small-offset-3 { margin-left: 24%; } +.row .small-offset-4 { margin-left: 32.33333%; } +.row .small-offset-5 { margin-left: 40.66667%; } +.row .small-offset-6 { margin-left: 49%; } +.row .small-offset-7 { margin-left: 57.33333%; } +.row .small-offset-8 { margin-left: 65.66667%; } +.row .small-offset-9 { margin-left: 74%; } +.row .small-offset-10 { margin-left: 82.33333%; } +.row .small-offset-11 { margin-left: 90.66667%; } +.row .small-offset-12 { margin-left: 99%; } + +.row .medium-offset-1 { margin-left: 7.33333%; } +.row .medium-offset-2 { margin-left: 15.66667%; } +.row .medium-offset-3 { margin-left: 24%; } +.row .medium-offset-4 { margin-left: 32.33333%; } +.row .medium-offset-5 { margin-left: 40.66667%; } +.row .medium-offset-6 { margin-left: 49%; } +.row .medium-offset-7 { margin-left: 57.33333%; } +.row .medium-offset-8 { margin-left: 65.66667%; } +.row .medium-offset-9 { margin-left: 74%; } +.row .medium-offset-10 { margin-left: 82.33333%; } +.row .medium-offset-11 { margin-left: 90.66667%; } +.row .medium-offset-12 { margin-left: 99%; } + +.row .large-offset-1 { margin-left: 7.33333%; } +.row .large-offset-2 { margin-left: 15.66667%; } +.row .large-offset-3 { margin-left: 24%; } +.row .large-offset-4 { margin-left: 32.33333%; } +.row .large-offset-5 { margin-left: 40.66667%; } +.row .large-offset-6 { margin-left: 49%; } +.row .large-offset-7 { margin-left: 57.33333%; } +.row .large-offset-8 { margin-left: 65.66667%; } +.row .large-offset-9 { margin-left: 74%; } +.row .large-offset-10 { margin-left: 82.33333%; } +.row .large-offset-11 { margin-left: 90.66667%; } +.row .large-offset-12 { margin-left: 99%; } + +.top-bar { + clear: both !important; + height: 100px !important; +} + +.locale, .external-links { + background: #002d50 !important; +} + +.locale { + float: left !important; +} + +.external-links { + color: white !important; + float: right !important; +} + +.top-bar-title, .top-bar-title a, .top-bar-title a { + display: inline-block !important; + float: none !important; +} + +.top-bar-title a { + line-height: 24px !important; + width: 100% !important; +} + +.proposal .supports { + display: inline-block !important; + margin: 0 !important; + position: inherit !important; + + &:after { + content: none !important; + } +} + +form { + + input, textarea { + height: 48px !important; + line-height: 48px !important; + margin-bottom: 24px !important; + width: 100% !important; + } + + input[type="checkbox"], + input[type="radio"] { + height: auto !important; + line-height: inherit !important; + width: auto !important; + } + + input[type="radio"] { + width: 18px !important; + } +} + +.subnavigation { + display: block; + height: 60px !important; + width: 100%; + + ul li a { + margin-left: 10px !important; + margin-right: 10px !important; + } +} + +.truncate { + background: none; +} + +// 02. Admin +// --------- + +body.admin form { + + input[type="text"], textarea { + height: 48px !important; + line-height: 48px !important; + margin-bottom: 24px !important; + } +} + +.admin-sidebar ul [class^="icon-"] { + padding-left: 12px !important; + padding-right: 12px !important; +} diff --git a/app/assets/stylesheets/layout.scss b/app/assets/stylesheets/layout.scss index 9152955dc..0ec0c12eb 100644 --- a/app/assets/stylesheets/layout.scss +++ b/app/assets/stylesheets/layout.scss @@ -396,8 +396,6 @@ header { color: $text; display: block; font-weight: bold; - margin-left: 18px\9; - margin-right: 18px\9; width: auto; &:hover { @@ -671,24 +669,9 @@ form { font-weight: bold; } - input, textarea { - height: 48px\9; - line-height: 48px\9; - margin-bottom: 24px\9; - width: 100%\9; - } - - input[type="checkbox"], - input[type="radio"] { - height: auto\9; - line-height: inherit\9; - width: auto\9; - } - input[type="radio"] { height: $line-height !important; vertical-align: top; - width: 18px\9; + label { font-weight: normal; diff --git a/app/views/layouts/application.html.erb b/app/views/layouts/application.html.erb index 269764328..35f8729c8 100644 --- a/app/views/layouts/application.html.erb +++ b/app/views/layouts/application.html.erb @@ -7,6 +7,9 @@ <%=render "layouts/tracking_data"%> <%= content_for?(:title) ? yield(:title) : setting['org_name'] %> <%= stylesheet_link_tag "application" %> + <%= javascript_include_tag "application", 'data-turbolinks-track' => true %> <%= csrf_meta_tags %> <%= favicon_link_tag "favicon.ico" %> diff --git a/config/initializers/assets.rb b/config/initializers/assets.rb index a13ed5320..7764ae0ec 100644 --- a/config/initializers/assets.rb +++ b/config/initializers/assets.rb @@ -13,3 +13,4 @@ Rails.application.config.assets.precompile += %w( ckeditor/* ) Rails.application.config.assets.precompile += %w( ie_lt9.js ) Rails.application.config.assets.precompile += %w( stat_graphs.js ) Rails.application.config.assets.precompile += %w( print.css ) +Rails.application.config.assets.precompile += %w( ie.css ) From 73d3d0c8c30b745bd4ba701fdb772872b572ffe6 Mon Sep 17 00:00:00 2001 From: kikito Date: Thu, 23 Jun 2016 17:48:18 +0200 Subject: [PATCH 085/126] hides the retire proposal link for admins in User#show --- app/views/users/_proposals.html.erb | 4 +--- 1 file changed, 1 insertion(+), 3 deletions(-) diff --git a/app/views/users/_proposals.html.erb b/app/views/users/_proposals.html.erb index f50045635..3112dd572 100644 --- a/app/views/users/_proposals.html.erb +++ b/app/views/users/_proposals.html.erb @@ -12,9 +12,7 @@ <%= link_to t("users.proposals.send_notification"), new_proposal_notification_path(proposal_id: proposal.id), class: 'button hollow' %> - <% end %> - <% if author_or_admin? %> <% if proposal.retired? %> <%= t('users.proposals.retired') %> @@ -30,4 +28,4 @@ <% end %> -<%= paginate @proposals %> \ No newline at end of file +<%= paginate @proposals %> From 947b2bcb0d87375e2d06dfc214154d2cd9497086 Mon Sep 17 00:00:00 2001 From: Alberto Garcia Cabeza Date: Mon, 27 Jun 2016 14:25:20 +0200 Subject: [PATCH 086/126] Adds user invites views on management --- .../management/user_invites_controller.rb | 9 +++++++++ app/views/management/_menu.html.erb | 11 +++++++---- app/views/management/user_invites/create.html.erb | 9 +++++++++ app/views/management/user_invites/new.html.erb | 12 ++++++++++++ config/locales/management.en.yml | 11 ++++++++++- config/locales/management.es.yml | 11 ++++++++++- config/routes.rb | 2 ++ 7 files changed, 59 insertions(+), 6 deletions(-) create mode 100644 app/controllers/management/user_invites_controller.rb create mode 100644 app/views/management/user_invites/create.html.erb create mode 100644 app/views/management/user_invites/new.html.erb diff --git a/app/controllers/management/user_invites_controller.rb b/app/controllers/management/user_invites_controller.rb new file mode 100644 index 000000000..707759877 --- /dev/null +++ b/app/controllers/management/user_invites_controller.rb @@ -0,0 +1,9 @@ +class Management::UserInvitesController < Management::BaseController + + def new + end + + def create + end + +end diff --git a/app/views/management/_menu.html.erb b/app/views/management/_menu.html.erb index 00e3b0516..aa154212e 100644 --- a/app/views/management/_menu.html.erb +++ b/app/views/management/_menu.html.erb @@ -1,9 +1,5 @@
    -
  • - <%= link_to t("management.menu.title"), management_root_path %> -
    • -
  • > @@ -61,5 +57,12 @@ <%= t("management.menu.print_spending_proposals") %> <% end %>
    • + +
  • + <%= link_to new_management_user_invite_path do %> + + <%= t("management.menu.user_invites") %> + <% end %> +
diff --git a/app/views/management/user_invites/create.html.erb b/app/views/management/user_invites/create.html.erb new file mode 100644 index 000000000..def83ef15 --- /dev/null +++ b/app/views/management/user_invites/create.html.erb @@ -0,0 +1,9 @@ +
+ <%= render 'shared/back_link' %> + +

<%= t('management.user_invites.create.title') %>

+ +
+ <%= t('management.user_invites.create.success_html') %> +
+
diff --git a/app/views/management/user_invites/new.html.erb b/app/views/management/user_invites/new.html.erb new file mode 100644 index 000000000..2779648d2 --- /dev/null +++ b/app/views/management/user_invites/new.html.erb @@ -0,0 +1,12 @@ +
+

<%= t('management.user_invites.new.title') %>

+ +
+ +

<%= t('management.user_invites.new.info') %>

+ +
+ +
+
+
diff --git a/config/locales/management.en.yml b/config/locales/management.en.yml index 74a58ac26..8060ac2c5 100644 --- a/config/locales/management.en.yml +++ b/config/locales/management.en.yml @@ -49,9 +49,9 @@ en: create_spending_proposal: Create spending proposal print_spending_proposals: Print spending proposals support_spending_proposals: Support spending proposals - title: Management users: Users edit_user_accounts: Edit user account + user_invites: User's invites permissions: create_proposals: Create proposals debates: Engage in debates @@ -97,3 +97,12 @@ en: erase_account_confirm: Are you sure you want to erase the account? This action can not be undone erase_warning: This action can not be undone. Please make sure you want to erase this account. erase_submit: Delete account + user_invites: + new: + label: Emails + info: "Enter the emails separated by commas (',')" + submit: Send invites + title: User's invites + create: + success_html: COUNT invitations have been sent. + title: User's invites \ No newline at end of file diff --git a/config/locales/management.es.yml b/config/locales/management.es.yml index c4545e675..749a7f449 100644 --- a/config/locales/management.es.yml +++ b/config/locales/management.es.yml @@ -49,9 +49,9 @@ es: create_spending_proposal: Crear propuesta de inversión print_spending_proposals: Imprimir propts. de inversión support_spending_proposals: Apoyar propts. de inversión - title: Gestión users: Usuarios edit_user_accounts: Editar cuenta de usuario + user_invites: Invitaciones para usuarios permissions: create_proposals: Crear nuevas propuestas debates: Participar en debates @@ -97,3 +97,12 @@ es: erase_account_confirm: ¿Seguro que quieres borrar a este usuario? Esta acción no se puede deshacer erase_warning: Esta acción no se puede deshacer. Por favor asegurese de que quiere eliminar esta cuenta. erase_submit: Borrar cuenta + user_invites: + new: + label: Emails + info: "Introduce los emails separados por ','" + submit: Enviar invitaciones + title: Invitaciones para usuarios + create: + success_html: Se han enviado COUNT invitaciones. + title: Invitaciones para usuarios \ No newline at end of file diff --git a/config/routes.rb b/config/routes.rb index ed2ee34e4..37497268c 100644 --- a/config/routes.rb +++ b/config/routes.rb @@ -235,6 +235,8 @@ Rails.application.routes.draw do resources :email_verifications, only: [:new, :create] + resources :user_invites, only: [:new, :create] + resources :users, only: [:new, :create] do collection do delete :logout From a2a2960867a58cc755dfb0cf8457e3af4662edac Mon Sep 17 00:00:00 2001 From: Alberto Garcia Cabeza Date: Mon, 27 Jun 2016 15:37:45 +0200 Subject: [PATCH 087/126] Adds mailer template for user invites --- app/views/mailer/user_invites.html.erb | 22 ++++++++++++++++++++++ config/locales/mailers.en.yml | 8 +++++++- config/locales/mailers.es.yml | 8 +++++++- 3 files changed, 36 insertions(+), 2 deletions(-) create mode 100644 app/views/mailer/user_invites.html.erb diff --git a/app/views/mailer/user_invites.html.erb b/app/views/mailer/user_invites.html.erb new file mode 100644 index 000000000..3510a6c88 --- /dev/null +++ b/app/views/mailer/user_invites.html.erb @@ -0,0 +1,22 @@ + +

+ <%= t('mailers.user_invites.title', + org: Setting['org_name']) %> +

+ +

+ <%= t('mailers.user_invites.text') %> +

+ +

+ <%= link_to t('mailers.user_invites.button'), new_user_registration_path, style: "font-family: 'Open Sans','Helvetica Neue',arial,sans-serif; background: #004A83; border-radius: 6px; color: #fff !important; font-weight: bold; margin: 0px; padding: 10px 15px; text-align: center; text-decoration: none; min-width: 160px; display: inline-block; margin-left: 12px;" %> +

+ +

+ <%= t('mailers.user_invites.ignore') %> +

+ +

+ <%= t('mailers.user_invites.thanks') %> +

+ diff --git a/config/locales/mailers.en.yml b/config/locales/mailers.en.yml index 17e3f6cf8..e17ccc68b 100755 --- a/config/locales/mailers.en.yml +++ b/config/locales/mailers.en.yml @@ -45,4 +45,10 @@ en: unsubscribe_account: My account direct_message_for_sender: subject: "You have send a new private message" - title_html: "You have send a new private message to %{receiver} with the content:" \ No newline at end of file + title_html: "You have send a new private message to %{receiver} with the content:" + user_invites: + ignore: "Please, if you have not requested this invite ignore this email." + text: "To start participating complete your registration in the Open Government Portal of the Madrid City Council." + thanks: "Thank you very much." + title: "Complete your registration in %{org}" + button: Complete registration \ No newline at end of file diff --git a/config/locales/mailers.es.yml b/config/locales/mailers.es.yml index 2a7a85013..48eade29f 100644 --- a/config/locales/mailers.es.yml +++ b/config/locales/mailers.es.yml @@ -45,4 +45,10 @@ es: unsubscribe_account: Mi cuenta direct_message_for_sender: subject: "Has enviado un nuevo mensaje privado" - title_html: "Has enviado un nuevo mensaje privado a %{receiver} con el siguiente contenido:" \ No newline at end of file + title_html: "Has enviado un nuevo mensaje privado a %{receiver} con el siguiente contenido:" + user_invites: + ignore: "Por favor, si no has solicitado esta invitación ignora este email." + text: "Para empezar a participar completa tu registro en el Portal de Gobierno Abierto del Ayuntamiento de Madrid." + thanks: "Muchas gracias." + title: "Completa tu registro en %{org}" + button: Completar registro \ No newline at end of file From 0bb948a0135e4583dd650b21a7c9cbf37492eff2 Mon Sep 17 00:00:00 2001 From: Alberto Garcia Cabeza Date: Mon, 27 Jun 2016 16:01:03 +0200 Subject: [PATCH 088/126] Updates mailer texts --- app/views/mailer/user_invites.html.erb | 3 ++- config/locales/mailers.en.yml | 6 +++--- config/locales/mailers.es.yml | 6 +++--- 3 files changed, 8 insertions(+), 7 deletions(-) diff --git a/app/views/mailer/user_invites.html.erb b/app/views/mailer/user_invites.html.erb index 3510a6c88..6d02022d3 100644 --- a/app/views/mailer/user_invites.html.erb +++ b/app/views/mailer/user_invites.html.erb @@ -5,7 +5,8 @@

- <%= t('mailers.user_invites.text') %> + <%= t('mailers.user_invites.text', + org: Setting['org_name']) %>

diff --git a/config/locales/mailers.en.yml b/config/locales/mailers.en.yml index e17ccc68b..6a14540be 100755 --- a/config/locales/mailers.en.yml +++ b/config/locales/mailers.en.yml @@ -47,8 +47,8 @@ en: subject: "You have send a new private message" title_html: "You have send a new private message to %{receiver} with the content:" user_invites: - ignore: "Please, if you have not requested this invite ignore this email." - text: "To start participating complete your registration in the Open Government Portal of the Madrid City Council." + ignore: "If you have not requested this invitation don't worry, you can ignore this email." + text: "Thank you for applying to join %{org}! In seconds you can start to decide the city you want, just fill the form below:" thanks: "Thank you very much." - title: "Complete your registration in %{org}" + title: "Welcome to %{org}" button: Complete registration \ No newline at end of file diff --git a/config/locales/mailers.es.yml b/config/locales/mailers.es.yml index 48eade29f..86d591134 100644 --- a/config/locales/mailers.es.yml +++ b/config/locales/mailers.es.yml @@ -47,8 +47,8 @@ es: subject: "Has enviado un nuevo mensaje privado" title_html: "Has enviado un nuevo mensaje privado a %{receiver} con el siguiente contenido:" user_invites: - ignore: "Por favor, si no has solicitado esta invitación ignora este email." - text: "Para empezar a participar completa tu registro en el Portal de Gobierno Abierto del Ayuntamiento de Madrid." + ignore: "Si no has solicitado esta invitación no te preocupes, puedes ignorar este correo." + text: "¡Gracias por solicitar unirte a %{org}! En unos segundos podrás empezar a decidir la ciudad que quieres, sólo tienes que rellenar el siguiente formulario:" thanks: "Muchas gracias." - title: "Completa tu registro en %{org}" + title: "Bienvenido a %{org}" button: Completar registro \ No newline at end of file From 745de9bb7775686d721956212c62936e07fd65e6 Mon Sep 17 00:00:00 2001 From: rgarcia Date: Mon, 27 Jun 2016 23:31:47 +0200 Subject: [PATCH 089/126] sends invitation email to users --- .../management/user_invites_controller.rb | 4 ++++ app/mailers/mailer.rb | 4 ++++ ..._invites.html.erb => user_invite.html.erb} | 10 ++++----- .../management/user_invites/create.html.erb | 2 +- .../management/user_invites/new.html.erb | 6 ++--- config/locales/mailers.en.yml | 5 +++-- config/locales/mailers.es.yml | 5 +++-- config/locales/management.en.yml | 2 +- config/locales/management.es.yml | 2 +- spec/features/emails_spec.rb | 22 +++++++++++++++++++ spec/features/user_invites_spec.rb | 18 +++++++++++++++ 11 files changed, 65 insertions(+), 15 deletions(-) rename app/views/mailer/{user_invites.html.erb => user_invite.html.erb} (55%) create mode 100644 spec/features/user_invites_spec.rb diff --git a/app/controllers/management/user_invites_controller.rb b/app/controllers/management/user_invites_controller.rb index 707759877..b022e6a86 100644 --- a/app/controllers/management/user_invites_controller.rb +++ b/app/controllers/management/user_invites_controller.rb @@ -4,6 +4,10 @@ class Management::UserInvitesController < Management::BaseController end def create + @emails = params[:emails].split + @emails.each do |email| + Mailer.user_invite(email).deliver_later + end end end diff --git a/app/mailers/mailer.rb b/app/mailers/mailer.rb index d987e34cc..55229ab72 100644 --- a/app/mailers/mailer.rb +++ b/app/mailers/mailer.rb @@ -68,6 +68,10 @@ class Mailer < ApplicationMailer end end + def user_invite(email) + mail(to: email, subject: t('mailers.user_invite.subject', org_name: Setting["org_name"])) + end + private def with_user(user, &block) diff --git a/app/views/mailer/user_invites.html.erb b/app/views/mailer/user_invite.html.erb similarity index 55% rename from app/views/mailer/user_invites.html.erb rename to app/views/mailer/user_invite.html.erb index 6d02022d3..43b95626c 100644 --- a/app/views/mailer/user_invites.html.erb +++ b/app/views/mailer/user_invite.html.erb @@ -1,23 +1,23 @@

- <%= t('mailers.user_invites.title', + <%= t('mailers.user_invite.title', org: Setting['org_name']) %>

- <%= t('mailers.user_invites.text', + <%= t('mailers.user_invite.text', org: Setting['org_name']) %>

- <%= link_to t('mailers.user_invites.button'), new_user_registration_path, style: "font-family: 'Open Sans','Helvetica Neue',arial,sans-serif; background: #004A83; border-radius: 6px; color: #fff !important; font-weight: bold; margin: 0px; padding: 10px 15px; text-align: center; text-decoration: none; min-width: 160px; display: inline-block; margin-left: 12px;" %> + <%= link_to t('mailers.user_invite.button'), new_user_registration_url, style: "font-family: 'Open Sans','Helvetica Neue',arial,sans-serif; background: #004A83; border-radius: 6px; color: #fff !important; font-weight: bold; margin: 0px; padding: 10px 15px; text-align: center; text-decoration: none; min-width: 160px; display: inline-block; margin-left: 12px;" %>

- <%= t('mailers.user_invites.ignore') %> + <%= t('mailers.user_invite.ignore') %>

- <%= t('mailers.user_invites.thanks') %> + <%= t('mailers.user_invite.thanks') %>

diff --git a/app/views/management/user_invites/create.html.erb b/app/views/management/user_invites/create.html.erb index def83ef15..3d573532f 100644 --- a/app/views/management/user_invites/create.html.erb +++ b/app/views/management/user_invites/create.html.erb @@ -4,6 +4,6 @@

<%= t('management.user_invites.create.title') %>

- <%= t('management.user_invites.create.success_html') %> + <%= t('management.user_invites.create.success_html', count: @emails.count) %>
diff --git a/app/views/management/user_invites/new.html.erb b/app/views/management/user_invites/new.html.erb index 2779648d2..a49a84538 100644 --- a/app/views/management/user_invites/new.html.erb +++ b/app/views/management/user_invites/new.html.erb @@ -1,12 +1,12 @@

<%= t('management.user_invites.new.title') %>

-
+ <%= form_tag management_user_invites_path do %>

<%= t('management.user_invites.new.info') %>

- + <%= text_area_tag "emails", nil, rows: 5, placeholder: t('management.user_invites.new.info') %>
-
+ <% end %>
diff --git a/config/locales/mailers.en.yml b/config/locales/mailers.en.yml index 6a14540be..9362b3202 100755 --- a/config/locales/mailers.en.yml +++ b/config/locales/mailers.en.yml @@ -46,9 +46,10 @@ en: direct_message_for_sender: subject: "You have send a new private message" title_html: "You have send a new private message to %{receiver} with the content:" - user_invites: + user_invite: ignore: "If you have not requested this invitation don't worry, you can ignore this email." text: "Thank you for applying to join %{org}! In seconds you can start to decide the city you want, just fill the form below:" thanks: "Thank you very much." title: "Welcome to %{org}" - button: Complete registration \ No newline at end of file + button: Complete registration + subject: "Invitation to %{org_name}" \ No newline at end of file diff --git a/config/locales/mailers.es.yml b/config/locales/mailers.es.yml index 86d591134..75523cf6c 100644 --- a/config/locales/mailers.es.yml +++ b/config/locales/mailers.es.yml @@ -46,9 +46,10 @@ es: direct_message_for_sender: subject: "Has enviado un nuevo mensaje privado" title_html: "Has enviado un nuevo mensaje privado a %{receiver} con el siguiente contenido:" - user_invites: + user_invite: ignore: "Si no has solicitado esta invitación no te preocupes, puedes ignorar este correo." text: "¡Gracias por solicitar unirte a %{org}! En unos segundos podrás empezar a decidir la ciudad que quieres, sólo tienes que rellenar el siguiente formulario:" thanks: "Muchas gracias." title: "Bienvenido a %{org}" - button: Completar registro \ No newline at end of file + button: Completar registro + subject: "Invitación a %{org_name}" \ No newline at end of file diff --git a/config/locales/management.en.yml b/config/locales/management.en.yml index 8060ac2c5..a0fffbde4 100644 --- a/config/locales/management.en.yml +++ b/config/locales/management.en.yml @@ -104,5 +104,5 @@ en: submit: Send invites title: User's invites create: - success_html: COUNT invitations have been sent. + success_html: %{count} invitations have been sent. title: User's invites \ No newline at end of file diff --git a/config/locales/management.es.yml b/config/locales/management.es.yml index 749a7f449..e5ee1c074 100644 --- a/config/locales/management.es.yml +++ b/config/locales/management.es.yml @@ -104,5 +104,5 @@ es: submit: Enviar invitaciones title: Invitaciones para usuarios create: - success_html: Se han enviado COUNT invitaciones. + success_html: Se han enviado %{count} invitaciones. title: Invitaciones para usuarios \ No newline at end of file diff --git a/spec/features/emails_spec.rb b/spec/features/emails_spec.rb index f793b5bb7..dcc90ca27 100644 --- a/spec/features/emails_spec.rb +++ b/spec/features/emails_spec.rb @@ -231,4 +231,26 @@ feature 'Emails' do end + context "User invites" do + + scenario "Send an invitation" do + login_as_manager + visit new_management_user_invite_path + + fill_in "emails", with: "john@example.com, ana@example.com, isable@example.com" + click_button "Send invites" + + expect(page).to have_content "3 invitations have been sent." + + expect(unread_emails_for("john@example.com").count).to eq 1 + expect(unread_emails_for("ana@example.com").count).to eq 1 + expect(unread_emails_for("isable@example.com").count).to eq 1 + + email = open_last_email + expect(email).to have_subject("Invitation to Consul") + expect(email).to have_body_text(/#{new_user_registration_path}/) + end + + end + end diff --git a/spec/features/user_invites_spec.rb b/spec/features/user_invites_spec.rb new file mode 100644 index 000000000..5627b0b7e --- /dev/null +++ b/spec/features/user_invites_spec.rb @@ -0,0 +1,18 @@ +require 'rails_helper' + +feature 'User invites' do + + background do + login_as_manager + end + + scenario "Send invitations" do + visit new_management_user_invite_path + + fill_in "emails", with: "john@example.com, ana@example.com, isable@example.com" + click_button "Send invites" + + expect(page).to have_content "3 invitations have been sent." + end + +end \ No newline at end of file From ad1720ba02ab7248f36c7924872e14c7cce1bcd2 Mon Sep 17 00:00:00 2001 From: rgarcia Date: Mon, 27 Jun 2016 23:38:23 +0200 Subject: [PATCH 090/126] uses applications's default locale --- app/mailers/mailer.rb | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/app/mailers/mailer.rb b/app/mailers/mailer.rb index 55229ab72..ad87359af 100644 --- a/app/mailers/mailer.rb +++ b/app/mailers/mailer.rb @@ -69,7 +69,9 @@ class Mailer < ApplicationMailer end def user_invite(email) - mail(to: email, subject: t('mailers.user_invite.subject', org_name: Setting["org_name"])) + I18n.with_locale(I18n.default_locale) do + mail(to: email, subject: t('mailers.user_invite.subject', org_name: Setting["org_name"])) + end end private From 9e55d4f7199bb0ebbc0057c15a553f0eff2fb8dd Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Juanjo=20Baz=C3=A1n?= Date: Tue, 28 Jun 2016 21:28:21 +0200 Subject: [PATCH 091/126] updates nokogiri (security update) --- Gemfile.lock | 10 ++++++---- 1 file changed, 6 insertions(+), 4 deletions(-) diff --git a/Gemfile.lock b/Gemfile.lock index b3c908001..cda18fa77 100644 --- a/Gemfile.lock +++ b/Gemfile.lock @@ -231,7 +231,7 @@ GEM mime-types (3.1) mime-types-data (~> 3.2015) mime-types-data (3.2016.0521) - mini_portile2 (2.0.0) + mini_portile2 (2.1.0) minitest (5.9.0) multi_json (1.12.1) multi_xml (0.5.5) @@ -240,8 +240,9 @@ GEM net-ssh (>= 2.6.5) net-ssh (3.1.1) newrelic_rpm (3.15.2.317) - nokogiri (1.6.7.2) - mini_portile2 (~> 2.0.0.rc2) + nokogiri (1.6.8) + mini_portile2 (~> 2.1.0) + pkg-config (~> 1.1.7) nori (2.6.0) oauth (0.5.0) oauth2 (1.0.0) @@ -279,6 +280,7 @@ GEM activerecord (>= 3.1) activesupport (>= 3.1) arel + pkg-config (1.1.7) poltergeist (1.9.0) capybara (~> 2.1) cliver (~> 0.3.1) @@ -505,4 +507,4 @@ DEPENDENCIES whenever BUNDLED WITH - 1.12.4 + 1.12.5 From 47a6480652c59631c713dba13d39540bb49c4135 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Juanjo=20Baz=C3=A1n?= Date: Tue, 28 Jun 2016 21:30:22 +0200 Subject: [PATCH 092/126] updates monitoring dependencies --- Gemfile | 2 +- Gemfile.lock | 6 +++--- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/Gemfile b/Gemfile index 50b9e37e9..31743146f 100644 --- a/Gemfile +++ b/Gemfile @@ -48,7 +48,7 @@ gem 'rollbar', '~> 2.11.0' gem 'delayed_job_active_record', '~> 4.1.0' gem 'daemons' gem 'devise-async' -gem 'newrelic_rpm', '~> 3.14' +gem 'newrelic_rpm', '~> 3.16' gem 'whenever', require: false gem 'pg_search' diff --git a/Gemfile.lock b/Gemfile.lock index cda18fa77..b420e7327 100644 --- a/Gemfile.lock +++ b/Gemfile.lock @@ -239,7 +239,7 @@ GEM net-scp (1.2.1) net-ssh (>= 2.6.5) net-ssh (3.1.1) - newrelic_rpm (3.15.2.317) + newrelic_rpm (3.16.0.318) nokogiri (1.6.8) mini_portile2 (~> 2.1.0) pkg-config (~> 1.1.7) @@ -327,7 +327,7 @@ GEM responders (2.2.0) railties (>= 4.2.0, < 5.1) rinku (2.0.0) - rollbar (2.11.3) + rollbar (2.11.5) multi_json rspec (3.4.0) rspec-core (~> 3.4.0) @@ -477,7 +477,7 @@ DEPENDENCIES kaminari launchy letter_opener_web (~> 1.3.0) - newrelic_rpm (~> 3.14) + newrelic_rpm (~> 3.16) omniauth omniauth-facebook (~> 3.0.0) omniauth-google-oauth2 (~> 0.4.0) From 96630f88f26a08ad244b5519d0f093ae6e76bf84 Mon Sep 17 00:00:00 2001 From: rgarcia Date: Wed, 29 Jun 2016 21:46:03 +0200 Subject: [PATCH 093/126] takes into account emails separated by commas without spaces --- app/controllers/management/user_invites_controller.rb | 2 +- spec/features/emails_spec.rb | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/app/controllers/management/user_invites_controller.rb b/app/controllers/management/user_invites_controller.rb index b022e6a86..cbe3d1914 100644 --- a/app/controllers/management/user_invites_controller.rb +++ b/app/controllers/management/user_invites_controller.rb @@ -4,7 +4,7 @@ class Management::UserInvitesController < Management::BaseController end def create - @emails = params[:emails].split + @emails = params[:emails].split(",").map(&:strip) @emails.each do |email| Mailer.user_invite(email).deliver_later end diff --git a/spec/features/emails_spec.rb b/spec/features/emails_spec.rb index dcc90ca27..ac1249fd6 100644 --- a/spec/features/emails_spec.rb +++ b/spec/features/emails_spec.rb @@ -237,7 +237,7 @@ feature 'Emails' do login_as_manager visit new_management_user_invite_path - fill_in "emails", with: "john@example.com, ana@example.com, isable@example.com" + fill_in "emails", with: " john@example.com, ana@example.com,isable@example.com " click_button "Send invites" expect(page).to have_content "3 invitations have been sent." From 22e1b533bc2dd5a376e1168bec9ea2d691e2e866 Mon Sep 17 00:00:00 2001 From: Alberto Garcia Cabeza Date: Mon, 4 Jul 2016 18:06:51 +0200 Subject: [PATCH 094/126] Removes Madrid from translations --- config/locales/devise.en.yml | 4 +-- config/locales/devise.es.yml | 4 +-- config/locales/devise_views.en.yml | 2 +- config/locales/devise_views.es.yml | 2 +- config/locales/en.yml | 21 ++++++------ config/locales/es.yml | 21 ++++++------ config/locales/mailers.en.yml | 4 +-- config/locales/mailers.es.yml | 4 +-- config/locales/management.en.yml | 7 ++-- config/locales/management.es.yml | 9 +++--- config/locales/pages.en.yml | 16 ++++----- config/locales/pages.es.yml | 16 ++++----- config/locales/verification.en.yml | 12 +++---- config/locales/verification.es.yml | 12 +++---- doc/locales/fr.yaml | 52 ++++++------------------------ doc/locales/pt-br.yaml | 48 +++++---------------------- 16 files changed, 83 insertions(+), 151 deletions(-) diff --git a/config/locales/devise.en.yml b/config/locales/devise.en.yml index a7504ff3d..30fb488ce 100755 --- a/config/locales/devise.en.yml +++ b/config/locales/devise.en.yml @@ -35,8 +35,8 @@ en: registrations: destroyed: "Goodbye! Your account has been cancelled. We hope to see you again soon. In accordance with your request, personal data registered as - a user of the site decide.madrid.es and form part of the file 'Gestión de procesos participativos' under the responsibility of the - Dirección General de Participación Ciudadana, they have been canceled under the terms of the provisions of Article 16 of the + a user of the site and form part of the file 'File' under the responsibility of the + 'Responsible', they have been canceled under the terms of the provisions of Article 16 of the Ley Orgánica 15/1999 de Protección de Datos de Carácter Personal and Article 31 of its Reglamento de desarrollo (RD 1720/2007)." signed_up: "Welcome! You have been authenticated." signed_up_but_inactive: "Your registration was successful, but you could not be signed in because your account has not been activated." diff --git a/config/locales/devise.es.yml b/config/locales/devise.es.yml index 9e5ad1f36..1a9c3a3b8 100644 --- a/config/locales/devise.es.yml +++ b/config/locales/devise.es.yml @@ -33,8 +33,8 @@ es: registrations: destroyed: "¡Adiós! Tu cuenta ha sido cancelada. Esperamos volver a verte pronto. Le informamos que de conformidad con su petición, - sus datos personales registrados como usuario de la Web decide.madrid.es y que forman parte del fichero 'Gestión de procesos participativos' - cuyo responsable es la Dirección General de Participación Ciudadana, han sido cancelados en los términos de lo previsto en el artículo 16 de la + sus datos personales registrados como usuario de la Web y que forman parte del fichero 'Fichero' + cuyo responsable es 'Responsable', han sido cancelados en los términos de lo previsto en el artículo 16 de la Ley Orgánica 15/1999 de Protección de Datos de Carácter Personal y del artículo 31 de su Reglamento de desarrollo (RD 1720/2007)." signed_up: "¡Bienvenido! Has sido identificado." signed_up_but_inactive: "Te has registrado correctamente, pero no has podido iniciar sesión porque tu cuenta no ha sido activada." diff --git a/config/locales/devise_views.en.yml b/config/locales/devise_views.en.yml index 8901e989d..bcd1f1a77 100755 --- a/config/locales/devise_views.en.yml +++ b/config/locales/devise_views.en.yml @@ -17,7 +17,7 @@ en: confirmation_instructions: confirm_link: Confirm my account text: 'You can confirm your email account at the following link:' - title: Welcome to the Open Government Portal of the Madrid City Council + title: Welcome to the Open Government Portal welcome: Welcome reset_password_instructions: change_link: Change my password diff --git a/config/locales/devise_views.es.yml b/config/locales/devise_views.es.yml index 97d618643..be8aff97b 100644 --- a/config/locales/devise_views.es.yml +++ b/config/locales/devise_views.es.yml @@ -17,7 +17,7 @@ es: confirmation_instructions: confirm_link: Confirmar mi cuenta text: 'Puedes confirmar tu cuenta de correo electrónico en el siguiente enlace:' - title: Te damos la bienvenida al Portal de Gobierno Abierto del Ayuntamiento de Madrid + title: Te damos la bienvenida al Portal de Gobierno Abierto welcome: Bienvenido/a reset_password_instructions: change_link: Cambiar mi contraseña diff --git a/config/locales/en.yml b/config/locales/en.yml index fb1138a44..adc9b275a 100755 --- a/config/locales/en.yml +++ b/config/locales/en.yml @@ -25,7 +25,7 @@ en: user_permission_support_proposal: Support proposals user_permission_title: Participation user_permission_verify: To perform all the actions verify your account. - user_permission_verify_info: "* Only for users on Madrid City Census." + user_permission_verify_info: "* Only for users on Census." user_permission_votes: Participate on final voting username_label: Username verified_account: Account verified @@ -169,30 +169,29 @@ en: consul: Consul application consul_url: https://github.com/consul/consul contact_us: For technical assistance enters - copyright: Ayuntamiento de Madrid, %{year} - description: This portal uses the %{consul} which is %{open_source}. From Madrid out into the world. + copyright: Consul, %{year} + description: This portal uses the %{consul} which is %{open_source}. faq: technical assistance more_info: More information open_data_text: Every detail about the City Council is yours to access. open_data_title: Open data open_source: open-source software open_source_url: http://www.gnu.org/licenses/agpl-3.0.html - participation_text: Decide how to shape the Madrid you want to live in. + participation_text: Decide how to shape the city you want to live in. participation_title: Participation privacy: Privacy Policy - transparency_text: Find out anything about the Madrid City Council. + transparency_text: Find out anything about the city. transparency_title: Transparency - transparency_url: https://transparencia.madrid.es + transparency_url: https://yourtransparencysite.com header: administration: Administration debates: Debates external_link_blog: Blog external_link_opendata: Open data - external_link_opendata_url: http://datos.madrid.es external_link_transparency: Transparency - external_link_transparency_url: https://transparencia.madrid.es + external_link_transparency_url: https://yourtransparencysite.com locale: 'Language:' - logo: Madrid + logo: Consul management: Management moderation: Moderation valuation: Valuation @@ -204,7 +203,7 @@ en: other: You have %{count} new notifications no_notifications: You don't have new notifications open: open - open_city_slogan_html: There are cities that are governed directly by their inhabitants, who discuss the topics they are concerned about, propose ideas to improve their lives and decide among themselves which ones will be carried out. Madrid is already one of these cities. + open_city_slogan_html: There are cities that are governed directly by their inhabitants, who discuss the topics they are concerned about, propose ideas to improve their lives and decide among themselves which ones will be carried out. open_city_title: Love the city, and it will become a city you love. open_data: Open data open_gov: Open government @@ -593,7 +592,7 @@ en: user_permission_proposal: Create new proposals user_permission_support_proposal: Support proposals* user_permission_verify: To perform all the actions verify your account. - user_permission_verify_info: "* Only for users on Madrid Census." + user_permission_verify_info: "* Only for users on Census." user_permission_verify_my_account: Verify my account user_permission_votes: Participate on final voting omniauth: diff --git a/config/locales/es.yml b/config/locales/es.yml index f4a74afbf..9a586e96a 100755 --- a/config/locales/es.yml +++ b/config/locales/es.yml @@ -25,7 +25,7 @@ es: user_permission_support_proposal: Apoyar propuestas* user_permission_title: Participación user_permission_verify: Para poder realizar todas las acciones verifica tu cuenta. - user_permission_verify_info: "* Sólo usuarios empadronados en el municipio de Madrid." + user_permission_verify_info: "* Sólo usuarios empadronados." user_permission_votes: Participar en las votaciones finales* username_label: Nombre de usuario verified_account: Cuenta verificada @@ -169,30 +169,29 @@ es: consul: aplicación Consul consul_url: https://github.com/consul/consul contact_us: Para asistencia técnica entra en - copyright: Ayuntamiento de Madrid, %{year} - description: Este portal usa la %{consul} que es %{open_source}. De Madrid, para el mundo entero. + copyright: Consul, %{year} + description: Este portal usa la %{consul} que es %{open_source}. faq: Asistencia técnica more_info: Más información open_data_text: Todos los datos del Ayuntamiento son tuyos. open_data_title: Datos Abiertos open_source: software libre open_source_url: http://www.gnu.org/licenses/agpl-3.0.html - participation_text: Decide cómo debe ser la ciudad de Madrid que quieres. + participation_text: Decide cómo debe ser la ciudad que quieres. participation_title: Participación privacy: Política de privacidad - transparency_text: Obtén cualquier información sobre el Ayuntamiento de Madrid. + transparency_text: Obtén cualquier información sobre la ciudad. transparency_title: Transparencia - transparency_url: https://transparencia.madrid.es + transparency_url: https://yourtransparencysite.com header: administration: Administrar debates: Debates external_link_blog: Blog external_link_opendata: Datos abiertos - external_link_opendata_url: http://datos.madrid.es external_link_transparency: Transparencia - external_link_transparency_url: https://transparencia.madrid.es + external_link_transparency_url: https://yourtransparencysite.com locale: 'Idioma:' - logo: Madrid + logo: Consul management: Gestión moderation: Moderar valuation: Evaluación @@ -204,7 +203,7 @@ es: other: Tienes %{count} notificaciones nuevas no_notifications: No tienes notificaciones nuevas open: abierto - open_city_slogan_html: Existen ciudades gobernadas directamente por sus habitantes, que debaten sobre temas que les preocupan, proponen ideas para mejorar sus vidas y deciden entre todas y todos las que se llevan a cabo. Madrid ya es una de ellas. + open_city_slogan_html: Existen ciudades gobernadas directamente por sus habitantes, que debaten sobre temas que les preocupan, proponen ideas para mejorar sus vidas y deciden entre todas y todos las que se llevan a cabo. open_city_title: La ciudad que quieres será la ciudad que quieras. open_data: Datos abiertos open_gov: Gobierno %{open} @@ -593,7 +592,7 @@ es: user_permission_proposal: Crear nuevas propuestas user_permission_support_proposal: Apoyar propuestas* user_permission_verify: Para poder realizar todas las acciones, verifica tu cuenta. - user_permission_verify_info: "* Sólo usuarios empadronados en el municipio de Madrid." + user_permission_verify_info: "* Sólo usuarios empadronados." user_permission_verify_my_account: Verificar mi cuenta user_permission_votes: Participar en las votaciones finales* omniauth: diff --git a/config/locales/mailers.en.yml b/config/locales/mailers.en.yml index 9362b3202..f4cdaf563 100755 --- a/config/locales/mailers.en.yml +++ b/config/locales/mailers.en.yml @@ -12,7 +12,7 @@ en: email_verification: click_here_to_verify: this link instructions_2_html: This email will verify your account with %{document_type} %{document_number}. If these don't belong to you, please don't click on the previous link and ignore this email. - instructions_html: To complete the verification of your user account in the Open Government Portal of the Madrid City Council, you must click %{verification_link}. + instructions_html: To complete the verification of your user account in the Open Government Portal, you must click %{verification_link}. subject: Confirm your email thanks: Thank you very much. title: Confirm your account using the following link @@ -30,7 +30,7 @@ en: signatory: "DEPARTMENT OF PUBLIC PARTICIPATION" sorry: "Sorry for the inconvenience and we again thank you for your invaluable participation." subject: "Your investment project '%{code}' has been marked as unfeasible" - unfeasible_html: "From the Madrid City Council we want to thank you for your participation in the participatory budgets of the city of Madrid. We regret to inform you that your proposal '%{title}' will be excluded from this participatory process for the following reason:" + unfeasible_html: "From the City Council we want to thank you for your participation in the participatory budgets. We regret to inform you that your proposal '%{title}' will be excluded from this participatory process for the following reason:" proposal_notification_digest: info: "Here are the new notifications that have been published by authors of the proposals that you have supported in %{org_name}." title: "Proposal notifications in %{org_name}" diff --git a/config/locales/mailers.es.yml b/config/locales/mailers.es.yml index 75523cf6c..ec6d50dcc 100644 --- a/config/locales/mailers.es.yml +++ b/config/locales/mailers.es.yml @@ -12,7 +12,7 @@ es: email_verification: click_here_to_verify: en este enlace instructions_2_html: Este email es para verificar tu cuenta con %{document_type} %{document_number}. Si esos no son tus datos, por favor no pulses el enlace anterior e ignora este email. - instructions_html: Para terminar de verificar tu cuenta de usuario en el Portal de Gobierno Abierto del Ayuntamiento de Madrid, necesitamos que pulses %{verification_link}. + instructions_html: Para terminar de verificar tu cuenta de usuario en el Portal de Gobierno Abierto, necesitamos que pulses %{verification_link}. subject: Verifica tu email thanks: Muchas gracias. title: Verifica tu cuenta con el siguiente enlace @@ -30,7 +30,7 @@ es: signatory: "DIRECCIÓN GENERAL DE PARTICIPACIÓN CIUDADANA" sorry: "Sentimos las molestias ocasionadas y volvemos a darte las gracias por tu inestimable participación." subject: "Tu propuesta de inversión '%{code}' ha sido marcada como inviable" - unfeasible_html: "Desde el Ayuntamiento de Madrid queremos agradecer tu participación en los Presupuestos Participativos de la ciudad de Madrid. Lamentamos informarte de que tu propuesta '%{title}' quedará excluida de este proceso participativo por el siguiente motivo:" + unfeasible_html: "Desde el Ayuntamiento queremos agradecer tu participación en los Presupuestos Participativos. Lamentamos informarte de que tu propuesta '%{title}' quedará excluida de este proceso participativo por el siguiente motivo:" proposal_notification_digest: info: "A continuación te mostramos las nuevas notificaciones que han publicado los autores de las propuestas que estás apoyando en %{org_name}." title: "Notificaciones de propuestas en %{org_name}" diff --git a/config/locales/management.en.yml b/config/locales/management.en.yml index a0fffbde4..8833eac0f 100644 --- a/config/locales/management.en.yml +++ b/config/locales/management.en.yml @@ -23,8 +23,9 @@ en: document_verifications: already_verified: This user account is already verified. has_no_account_html: In order to create an account, go to %{link} and click in 'Register' in the upper-left part of the screen. + link: Consul in_census_has_following_permissions: 'This user can participate in the website with the following permissions:' - not_in_census: This document is not registered in Madrid. + not_in_census: This document is not registered. not_in_census_info: 'Citizens not in the Census can participate in the website with the following permissions:' please_check_account_data: Please check that the account data above are correct. title: User management @@ -58,10 +59,10 @@ en: support_proposals: Support proposals vote_proposals: Vote proposals print: - proposals_info: Create yor proposal on http://decide.madrid.es + proposals_info: Create yor proposal on http://hereyoursite.com proposals_note: The proposals more supported will be voted. If are accepted by a majority, the city Council shall be carried out. proposals_title: 'Proposals:' - spending_proposals_info: Participate at http://decide.madrid.es + spending_proposals_info: Participate at http://hereyoursite.com spending_proposals_note: Participatory budget will be assigned to the most votes spending proposals. print_info: Print this info proposals: diff --git a/config/locales/management.es.yml b/config/locales/management.es.yml index e5ee1c074..4b2e9061a 100644 --- a/config/locales/management.es.yml +++ b/config/locales/management.es.yml @@ -23,8 +23,9 @@ es: document_verifications: already_verified: Esta cuenta de usuario ya está verificada. has_no_account_html: Para crear un usuario entre en %{link} y haga clic en la opción 'Registrarse' en la parte superior derecha de la pantalla. - in_census_has_following_permissions: 'Este usuario puede participar en el Portal de Gobierno Abierto del Ayuntamiento de Madrid con las siguientes posibilidades:' - not_in_census: Este documento no está registrado en el Padrón Municipal de Madrid. + link: Consul + in_census_has_following_permissions: 'Este usuario puede participar en el Portal de Gobierno Abierto con las siguientes posibilidades:' + not_in_census: Este documento no está registrado. not_in_census_info: 'Las personas no empadronadas en Madrid pueden participar en el Portal de Gobierno Abierto del Ayuntamiento de Madrid con las siguientes posibilidades:' please_check_account_data: Compruebe que los datos anteriores son correctos para proceder a verificar la cuenta completamente. title: Gestión de usuarios @@ -58,10 +59,10 @@ es: support_proposals: Apoyar propuestas vote_proposals: Participar en las votaciones finales print: - proposals_info: Haz tu propuesta en http://decide.madrid.es + proposals_info: Haz tu propuesta en http://hereyoursite.com proposals_note: Las propuestas más apoyadas serán llevadas a votación. Y si las acepta una mayoría, el Ayuntamiento las llevará a cabo. proposals_title: 'Propuestas:' - spending_proposals_info: Participa en http://decide.madrid.es + spending_proposals_info: Participa en http://hereyoursite.com spending_proposals_note: Los presupuestos participativos se invertirán en las propuestas de inversión más apoyadas. print_info: Imprimir esta información proposals: diff --git a/config/locales/pages.en.yml b/config/locales/pages.en.yml index 72d3b117d..bb2a12a0d 100755 --- a/config/locales/pages.en.yml +++ b/config/locales/pages.en.yml @@ -1,7 +1,7 @@ --- en: pages: - census_terms: To confirm the account, you must be 16 or older and be registered as resident in Madrid, having provided the information requested previously, which the Directorate-General of Civil Participation will verify against the files 'Municipal Census of Inhabitants', for which the Directorate-General for Statistics is responsible, and the 'Citizen Support Services', for which the Directorate-General for Quality and Citizen Services is responsible. By accepting the verification process, you also consent to the verification of this information, as well as the contact methods featuring in said files. The data provided will be acquired and processed by the Directorate-General for Civil Participation in the file 'Management of Participatory Activities' mentioned previously in the terms and conditions of use for the Portal. + census_terms: To confirm the account, you must be 16 or older and be registered, having provided the information requested previously, will verify. By accepting the verification process, you also consent to the verification of this information, as well as the contact methods featuring in said files. The data provided will be acquired and processed in a file mentioned previously in the terms and conditions of use for the Portal. conditions: Terms and conditions of use general_terms: Terms and Conditions more_information: @@ -22,7 +22,7 @@ en: text: |- The new Open Government Portal is divided in three parts: Participation, Transparency and Open Data (you can see the links in the upper right-hand part). >**I. Participation:** In this part we can decide which city we want (using citizen proposals, debate areas, participatory budgets , collaborative legislation, and many others we will implement). - **II. Transparency:** In this part information about how Madrid is managed will be published every day: name, position, salary, contracts, agenda,... of the persons in charge. It is also the place where exercise your right to access information, having the chance to request any information about Madrid City Council easily and rapidly. + **II. Transparency:** In this part information about how the city is managed will be published every day: name, position, salary, contracts, agenda,... of the persons in charge. It is also the place where exercise your right to access information, having the chance to request any information about City Council easily and rapidly. **III. Open data:** In this part the city council databases are posted, so that anyone can use information directly, without having to ask. It can also be requested the publication of more databases. We have opened the new Participation portal and we will open the new Transparency and Open Data seccion shortly (meanwhile the links to existing sites are kept). @@ -33,13 +33,13 @@ en: Both threads and comments could be valued by anyone, so the citizenship, and not someone in its name, will decide which are the most important issues in every moment. These will be showed in the main page of the space, being able to access also the rest of issues in following pages, or using others order criteria (the most commented, the newst, the most controversial, etc.). - Every city council employee has its own user, which will be designated as such, allowing them to participate in debates at the same level than the rest of citizens. That will allow creating direct communication spaces between them, avoiding the problems that implies the measured communication, and following clear approach of the new Madrid City Council by virtue of which the city council works for the citizenship. + Every city council employee has its own user, which will be designated as such, allowing them to participate in debates at the same level than the rest of citizens. That will allow creating direct communication spaces between them, avoiding the problems that implies the measured communication, and following clear approach of the new City Council by virtue of which the city council works for the citizenship. ## I.I. Proposals area In the proposals area everyone can propose an initiative with the intention of collecting support enough for the idea being consulting to the whole citizenship with binding effect. - The proposals can be supported by every citizen registered in Madrid that has verified their account in the participation platform. In this way, the citizenship, and not someone in its name, will decide which are the proposals that are worthwhile to carry out. + The proposals can be supported by every citizen registered that has verified their account in the participation platform. In this way, the citizenship, and not someone in its name, will decide which are the proposals that are worthwhile to carry out. - One that the proposal has achive support of 2% Madrid census (arround 53000 people), it will be studied by a city council group and to move beyond the popular referendum phase, in which Madrid citizenship will vote if it is carried out or not. The maximum period to obtain support enough is 12 months. + One that the proposal has achive support of 2% census, it will be studied by a city council group and to move beyond the popular referendum phase, in which citizenship will vote if it is carried out or not. The maximum period to obtain support enough is 12 months. how_to_use: text: |- Use it in your local government or help us to improve it, it is free software. @@ -53,15 +53,14 @@ en: faq: Solution to tecnical problemas (FAQ) how_it_works: How does this Open Government Portal work? how_to_use: Use it in your local government - participation: Madrid Participation and Transparency y Transparencia - coming news + participation: Participation and Transparency y Transparencia - coming news participation_facts: Facts about citizen participation and direct democracy participation_world: Direct citizen participation in the world proposals_info: How does citizen proposals work? signature_sheet: Signature sheet spending_proposals_info: How does participatory budgeting work? opendata: - go_old: Go to Open Data Portal - slogan_html: 'We are working on the new Madrid City Council Open Data Portal, meanwhile you can visit the actual Open Data Portal:' + slogan: "Information about Open Data." title: Open Data privacy: Privacy Policy titles: @@ -78,4 +77,3 @@ en: password: Password submit: Verify my account title: Verify your account - while_unfinished_html: While we finish, we encourage you to visit the Citizen Participation Area, Transparency and Open Government blog to know about our progress and news; or the Citizen Participation section where you can decide which is the city you want. diff --git a/config/locales/pages.es.yml b/config/locales/pages.es.yml index 6b47a950c..733b064b3 100644 --- a/config/locales/pages.es.yml +++ b/config/locales/pages.es.yml @@ -1,7 +1,7 @@ --- es: pages: - census_terms: Para verificar la cuenta hay que tener 16 años o más y estar empadronado en Madrid aportando los datos indicados anteriormente, los cuales serán contrastados por la Dirección General de Participación Ciudadana con los ficheros 'Padrón Municipal de Habitantes' cuyo responsable es la Dirección General de Estadística y 'Servicios Atención al Ciudadano' cuyo responsable es la Dirección General de Calidad y Atención al Ciudadano. Aceptando el proceso de verificación acepta dar su consentimiento para contrastar dicha información, así como medios de contacto que figuren en dichos ficheros. Los datos aportados serán incorporados y tratados por la Dirección General de Participación Ciudadana en el fichero 'Gestión de Procesos Participativos' indicado anteriormente en las condiciones de uso del portal. + census_terms: Para verificar la cuenta hay que tener 16 años o más y estar empadronado aportando los datos indicados anteriormente, los cuales serán contrastados. Aceptando el proceso de verificación acepta dar su consentimiento para contrastar dicha información, así como medios de contacto que figuren en dichos ficheros. Los datos aportados serán incorporados y tratados en un fichero indicado anteriormente en las condiciones de uso del portal. conditions: Condiciones de uso general_terms: Términos y Condiciones more_information: @@ -22,7 +22,7 @@ es: text: |- El nuevo Portal de Gobierno Abierto está dividido en tres partes: Participación, Transparencia y Datos Abiertos (verás los enlaces en la parte superior derecha). >**I. Participación:** Donde poder decidir qué ciudad queremos tener (a través de propuestas ciudadanas, espacios de debate, presupuestos participativos, legislación colaborativa, y muchos otros procesos que iremos implementando). - **II. Transparencia:** En este espacio se publicarán todos los datos relativos a quién y cómo se gestiona Madrid (nombres de los responsables, cargos, sueldos, planes de gobierno, contratos, agendas de los responsables...). Además es el espacio donde ejercer el derecho de acceso a la información, pudiendo solicitar cualquier información sobre el Ayuntamiento de Madrid de manera fácil y rápida. + **II. Transparencia:** En este espacio se publicarán todos los datos relativos a quién y cómo se gestiona la ciudad (nombres de los responsables, cargos, sueldos, planes de gobierno, contratos, agendas de los responsables...). Además es el espacio donde ejercer el derecho de acceso a la información, pudiendo solicitar cualquier información sobre el Ayuntamiento de manera fácil y rápida. **III. Datos Abiertos:** En este espacio se cuelgan las bases de datos que tiene el Ayuntamiento, para que cualquiera pueda usar toda la información directamente, sin necesidad ni siquiera de preguntar. También se puede solicitar la publicación de más bases de datos. Inauguramos el nuevo portal con la nueva sección de Participación, y en breve añadiremos las nuevas secciones de Transparencia y Datos Abiertos (así que mantenemos por el momento los enlaces a las páginas al respecto que ya existían). @@ -33,13 +33,13 @@ es: Tanto los hilos, como los comentarios podrán ser valorados por cualquiera, de tal manera que será la propia ciudadanía, y nadie en su nombre, la que decida cuáles son los temas más importantes en cada momento. Estos serán presentados en la portada del espacio, pudiendo por supuesto accederse a todos los demás temas en páginas posteriores, o usando otros criterios de ordenación (los temas con más comentarios, los más nuevos, los más controvertidos, etc.). - Cada uno de los trabajadores del Ayuntamiento tiene un usuario propio, que será resaltado como tal, permitiendo que participen en los debates al mismo nivel que todos los demás ciudadanos. Esto permitirá crear espacios de comunicación directos entre unos y otros, evitando los inconvenientes que implica la comunicación medidada, y respondiendo a un planteamiento claro por parte del nuevo gobierno de Madrid por el cual el Ayuntamiento trabaja para la ciudadanía, y ante ella debe responder. + Cada uno de los trabajadores del Ayuntamiento tiene un usuario propio, que será resaltado como tal, permitiendo que participen en los debates al mismo nivel que todos los demás ciudadanos. Esto permitirá crear espacios de comunicación directos entre unos y otros, evitando los inconvenientes que implica la comunicación medidada, y respondiendo a un planteamiento claro por parte del nuevo gobierno por el cual el Ayuntamiento trabaja para la ciudadanía, y ante ella debe responder. ## I.I. Espacio de propuestas En este espacio, cualquier persona puede proponer una iniciativa con la intención de recabar los suficientes apoyos como para que la idea pase a ser consultada a toda la ciudadanía con caracter vinculante. - Las propuestas pueden ser apoyadas por ciudadanos empadronados en Madrid que hayan verificado su cuenta en la plataforma de participación, de tal manera que será la propia ciudadanía, y nadie en su nombre, la que decida cuáles son las propuestas que merecen la pena ser llevadas a cabo. + Las propuestas pueden ser apoyadas por ciudadanos empadronados que hayan verificado su cuenta en la plataforma de participación, de tal manera que será la propia ciudadanía, y nadie en su nombre, la que decida cuáles son las propuestas que merecen la pena ser llevadas a cabo. - Una vez que una propuesta alcance una cantidad de apoyos equivalente al 2% del censo de Madrid (unos 53000), automaticamente pasa a ser estudiada por un grupo de trabajo del Ayuntamiento y pasará a la siguiente fase de consulta popular, en la que la ciudadanía de Madrid votará si se lleva a cabo o no. El plazo máximo para recabar los apoyos necesarios será de 12 meses. + Una vez que una propuesta alcance una cantidad de apoyos equivalente al 2% del censo, automaticamente pasa a ser estudiada por un grupo de trabajo del Ayuntamiento y pasará a la siguiente fase de consulta popular, en la que la ciudadanía votará si se lleva a cabo o no. El plazo máximo para recabar los apoyos necesarios será de 12 meses. how_to_use: text: |- Utilízalo en tu municipio libremente o ayúdanos a mejorarlo, es software libre. @@ -53,15 +53,14 @@ es: faq: Soluciones a problemas técnicos (FAQ) how_it_works: "¿Cómo funciona este Portal de Gobierno Abierto?" how_to_use: Utilízalo en tu municipio - participation: Participación y Transparencia en Madrid - Próximas novedades + participation: Participación y Transparencia - Próximas novedades participation_facts: Hechos sobre participación ciudadana y democracia directa participation_world: Participación ciudadana directa en el mundo proposals_info: "¿Cómo funcionan las propuestas ciudadanas?" signature_sheet: Hojas de firmas spending_proposals_info: "¿Cómo funcionan los presupuestos participativos?" opendata: - go_old: Ir al Portal de Datos Abiertos - slogan_html: 'Estamos trabajando en el nuevo Portal de Datos Abiertos del Ayuntamiento de Madrid, por ahora puedes visitar el portal que existía hasta ahora:' + slogan: "Información sobre Datos abiertos." title: Datos abiertos privacy: Política de Privacidad titles: @@ -78,4 +77,3 @@ es: password: Contraseña submit: Verificar mi cuenta title: Verifica tu cuenta - while_unfinished_html: Mientras acabamos el nuevo portal, te invitamos a visitar el blog del Área de Participación Ciudadana, Transparencia y Gobierno Abierto para conocer nuestros avances y novedades; o la sección de Participación Ciudadana donde poder decidir qué ciudad es la que quieres. diff --git a/config/locales/verification.en.yml b/config/locales/verification.en.yml index 8b7617f1a..6474ac20d 100755 --- a/config/locales/verification.en.yml +++ b/config/locales/verification.en.yml @@ -21,7 +21,7 @@ en: create: flash: offices: Citizen Support Offices - offices_url: http://www.madrid.es/portales/munimadrid/es/Inicio/El-Ayuntamiento/Atencion-al-ciudadano/Oficinas-de-Atencion-al-Ciudadano?vgnextfmt=default&vgnextchannel=5b99cde2e09a4310VgnVCM1000000b205a0aRCRD + offices_url: http://yourcitizensupportofficesite.com success_html: Thank you for requesting your maximum security code (only required for the final votes). In a few days we will send it to the address featuring in the data we have on file. Please remember that, if you prefer, you can collect your code from any of the %{offices}. edit: see_all: See proposals @@ -33,7 +33,7 @@ en: go_to_index: See proposals office: Verify in any %{office} offices: Citizen Support Offices - offices_url: http://www.madrid.es/portales/munimadrid/es/Inicio/El-Ayuntamiento/Atencion-al-ciudadano/Oficinas-de-Atencion-al-Ciudadano?vgnextfmt=default&vgnextchannel=5b99cde2e09a4310VgnVCM1000000b205a0aRCRD + offices_url: http://yourcitizensupportofficesite.com send_letter: Send me a letter with the code title: Congratulations! user_permission_info: With your account you can... @@ -62,12 +62,12 @@ en: spanish_id: DNI document_type_label: Document type error_not_allowed_age: You must be at least 16 years old - error_not_allowed_postal_code: In order to be verified, you must be registered in the municipality of Madrid. - error_verifying_census: The Madrid Census was unable to verify your information. Please confirm that your census details are correct by calling 010 (or 915298210) or visit any of %{offices}. - error_verifying_census_offices: 26 Office of Citizen + error_not_allowed_postal_code: In order to be verified, you must be registered. + error_verifying_census: The Census was unable to verify your information. Please confirm that your census details are correct by calling to City Council or visit one %{offices}. + error_verifying_census_offices: Citizen Support Office form_errors: prevented the verification of your residence postal_code: Postcode - postal_code_note: To verify your account you must be on Madrid city Census + postal_code_note: To verify your account you must be registered terms: the terms and conditions of access title: Verify residence verify_residence: Verify residence diff --git a/config/locales/verification.es.yml b/config/locales/verification.es.yml index 7c27584a7..e6d0ffa0d 100644 --- a/config/locales/verification.es.yml +++ b/config/locales/verification.es.yml @@ -21,7 +21,7 @@ es: create: flash: offices: Oficinas de Atención al Ciudadano - offices_url: http://www.madrid.es/portales/munimadrid/es/Inicio/El-Ayuntamiento/Atencion-al-ciudadano/Oficinas-de-Atencion-al-Ciudadano?vgnextfmt=default&vgnextchannel=5b99cde2e09a4310VgnVCM1000000b205a0aRCRD + offices_url: http://yourcitizensupportofficesite.com success_html: Antes de las votaciones recibirás una carta con las instrucciones para verificar tu cuenta.
Recuerda que puedes ahorrar el envío verificándote presencialmente en cualquiera de las %{offices}. edit: see_all: Ver propuestas @@ -33,7 +33,7 @@ es: go_to_index: Ver propuestas office: Verificarte presencialmente en cualquier %{office} offices: Oficina de Atención al Ciudadano - offices_url: http://www.madrid.es/portales/munimadrid/es/Inicio/El-Ayuntamiento/Atencion-al-ciudadano/Oficinas-de-Atencion-al-Ciudadano?vgnextfmt=default&vgnextchannel=5b99cde2e09a4310VgnVCM1000000b205a0aRCRD + offices_url: http://yourcitizensupportofficesite.com send_letter: Solicitar una carta por correo postal title: "¡Felicidades!" user_permission_info: Con tu cuenta ya puedes... @@ -62,12 +62,12 @@ es: spanish_id: DNI document_type_label: Tipo de documento error_not_allowed_age: Hay que tener al menos 16 años - error_not_allowed_postal_code: Para verificarte debes estar empadronado en el municipio de Madrid. - error_verifying_census: El Padrón de Madrid no pudo verificar tu información. Por favor, confirma que tus datos de empadronamiento sean correctos llamando al 010 (o a su versión gratuita 915298210) o visita cualquiera de las %{offices}. - error_verifying_census_offices: 26 Oficinas de Atención al Ciudadano + error_not_allowed_postal_code: Para verificarte debes estar empadronado. + error_verifying_census: El Padrón no pudo verificar tu información. Por favor, confirma que tus datos de empadronamiento sean correctos llamando al Ayuntamiento o visitando una %{offices}. + error_verifying_census_offices: oficina de Atención al ciudadano form_errors: evitaron verificar tu residencia postal_code: Código postal - postal_code_note: Para verificar tus datos debes estar empadronado en el municipio de Madrid + postal_code_note: Para verificar tus datos debes estar empadronado terms: los términos de acceso title: Verificar residencia verify_residence: Verificar residencia diff --git a/doc/locales/fr.yaml b/doc/locales/fr.yaml index 5ed967599..3b8e5571c 100644 --- a/doc/locales/fr.yaml +++ b/doc/locales/fr.yaml @@ -362,7 +362,7 @@ fr: - Ven - Sam abbr_month_names: - - + - - Jan - Fév - Mar @@ -388,7 +388,7 @@ fr: long: "%B %d, %Y" short: "%b %d" month_names: - - + - - Janvier - Février - Mars @@ -850,7 +850,7 @@ fr: consul: Application Consul consul_url: https://github.com/consul/consul contact_us: Pour l'assistance technique entrer - copyright: Mairie de Madrid, %{year} + copyright: Consul, %{year} description: Ce portail utiliser %{consul} qui est %{open_source}. De Madrid ouvert sur le monde. faq: assistance technique @@ -865,17 +865,16 @@ fr: privacy: Vie privée transparency_text: Trouver tout à propos de la mairie de Madrid transparency_title: Transparence - transparency_url: https://transparencia.madrid.es + transparency_url: https://yourtransparencysite.com header: administration: Administration debates: Débats external_link_blog: Blog external_link_opendata: Open data - external_link_opendata_url: http://datos.madrid.es external_link_transparency: Transparence - external_link_transparency_url: https://transparencia.madrid.es + external_link_transparency_url: https://yourtransparencysite.com locale: 'Langue :' - logo: Madrid + logo: Consul moderation: Modération more_information: Plus d'information my_account_link: Mon compte @@ -892,7 +891,6 @@ fr: open_city_title: Aimez la ville, et elle deviendra la ville que vous aimez open_data: Open data open_gov: Gouvernement ouvert - processes: Processus ouverts proposals: Propositions spending_proposals: Propositions de dépense locale: Français @@ -942,7 +940,7 @@ fr: écran. in_census_has_following_permissions: 'Cet utilisateur peut participer dans la plateforme avec les autorisations suivantes :' - not_in_census: Ce document n'est pas enregistré à Madrid. + not_in_census: Ce document n'est pas enregistré. not_in_census_info: 'Les personnes non-enregistrées dans le recensement peuvent participer dans la plateforme avec les autorisations suivantes :' please_check_account_data: Merci de vérifier que vos informations ci-dessus @@ -1227,35 +1225,10 @@ fr: signature_sheet: Feuille de signature spending_proposals_info: Comment marche le budget participatif ? opendata: - go_old: Visiter le portail Open Data - slogan_html: Nous travaillons sur le nouveau portail Open Data de la Ville de + slogan: Nous travaillons sur le nouveau portail Open Data de la Ville de Madrid, tandis que vous pouvez toujours visiter la version actuelle. title: Open Data privacy: Vie privée - processes: - back: Revenir - index: - process_1_button: Plus d'informations - process_1_description: Madrid veut lancer un système de transparence publique - le plus avancé dans le monde et vous avons besoin de votre aide. - process_1_title: Loi de transparence - process_2_button: Plus d'informations - process_2_description: Nous comptons sur vous pour décider comment vous voyez - ce nouvel espace dans la ville. - process_2_title: Remodelage de la Plaza España - process_1: - button: Ordonnance - comment: Laissez vos commentaires - text: "Jusqu'au 31 Janvier vous pouvez %{comment} sur le projet d'ordonnace - de Transparence de la ville de Madrid ou envoyer un mail à transparence@madrid.es.\r\n\r\nVous - pouvez voir maintenant le [projet d'ordonnance final de Transparence de - la ville de Madrid](/docs/ordenanza_de_transparencia_de_la_ciudad_de_madrid.doc - 'Transparency Ordinance of the City of Madrid')" - title: Aidez-nous à traduire l'ordonnance de transparence de la ville de Madrid - process_2: - text: Nous comptons sur vous pour remplir ce court questionnaire pour décider - de ce nouvel espace dans votre ville. - title: Transformation de la Plaza de España titles: accessibility: Accessibilité conditions: Conditions d'utilisation @@ -1270,11 +1243,6 @@ fr: password: Mot de passe submit: Vérifier mon compte title: Vérifier mon compte - while_unfinished_html: Pendant que nous terminons, nous vous encourageons à visiter - Citizen Participation Area, Transparency and - Open Government blog pour vous informer sur nos nouvelles et pogrès ou sur - Citizen Participation section où vous décidez de la ville que - vous souhaitez. proposals: create: form: @@ -1529,7 +1497,7 @@ fr: create: flash: offices: Bureaux de soutien aux citoyens - offices_url: http://www.madrid.es/portales/munimadrid/es/Inicio/El-Ayuntamiento/Atencion-al-ciudadano/Oficinas-de-Atencion-al-Ciudadano?vgnextfmt=default&vgnextchannel=5b99cde2e09a4310VgnVCM1000000b205a0aRCRD + offices_url: http://yourcitizensupportofficesite.com success_html: Merci d'avoir demandé votre code de sécurité maximum (uniquement requis pour le vote final). Dans quelques jours, nous vous enverrons un courrier vers votre adresse postale. Vous pouvez le réclamer dans n'importe @@ -1544,7 +1512,7 @@ fr: go_to_index: Voir les propositions office: Vérifier dans n'importe quel %{office} offices: Bureaux de soutien aux citoyens - offices_url: http://www.madrid.es/portales/munimadrid/es/Inicio/El-Ayuntamiento/Atencion-al-ciudadano/Oficinas-de-Atencion-al-Ciudadano?vgnextfmt=default&vgnextchannel=5b99cde2e09a4310VgnVCM1000000b205a0aRCRD + offices_url: http://yourcitizensupportofficesite.com send_letter: Envoyer une lettre avec le code title: Félicitations user_permission_info: Avec votre compte, vous pouvez diff --git a/doc/locales/pt-br.yaml b/doc/locales/pt-br.yaml index 09521ecc2..363427030 100644 --- a/doc/locales/pt-br.yaml +++ b/doc/locales/pt-br.yaml @@ -840,7 +840,7 @@ pt-BR: consul: Aplicativo Consul consul_url: https://github.com/consul/consul contact_us: Para suporte técnico entre - copyright: Ayuntamiento de Madrid, %{year} + copyright: Consul, %{year} description: Este portal usa o %{consul} que é %{open_source}. De Madrid para o mundo. faq: suporte técnico @@ -854,17 +854,16 @@ pt-BR: privacy: Política de privacidade transparency_text: Descubra tudo sobre a Câmara da Cidade de Madrid. transparency_title: Transparência - transparency_url: https://transparencia.madrid.es + transparency_url: https://yourtransparencysite.com header: administration: Administração debates: Debates external_link_blog: Blog external_link_opendata: Dados abertos - external_link_opendata_url: http://datos.madrid.es external_link_transparency: Transparência - external_link_transparency_url: https://transparencia.madrid.es + external_link_transparency_url: https://yourtransparencysite.com locale: 'Idioma:' - logo: Madrid + logo: Consul moderation: Moderação more_information: Mais informações my_account_link: Minha conta @@ -881,7 +880,6 @@ pt-BR: open_city_title: Ame a cidade e ela se transformará na cidade que você ama. open_data: Dados abertos open_gov: Governo aberto - processes: Processos abertos proposals: Propostas spending_proposals: Propostas de despesas locale: Português brasileiro @@ -928,7 +926,7 @@ pt-BR: em 'Register' na parte superior esquerda de sua tela/janela. in_census_has_following_permissions: 'Este usuário pode participar no website com as seguintes permissões:' - not_in_census: Este documento não está registrado em Madrid. + not_in_census: Este documento não está registrado. not_in_census_info: 'Cidadãos fora do Censo podem participar no website com as seguintes permissões:' please_check_account_data: Por favor confira se os dados da conta acima estão @@ -1246,36 +1244,11 @@ pt-BR: signature_sheet: Página de assinaturas spending_proposals_info: Como funciona o orçamento participativo? opendata: - go_old: Vá para o Portal de Dados Abertos - slogan_html: 'Estamos trabalhando no novo Portal de Dados Abertos da Câmara + slogan: 'Estamos trabalhando no novo Portal de Dados Abertos da Câmara da Cidade de Madrid, enquanto isso você pode visitar o atual Portal de Dados abertos:' title: Dados Abertos privacy: Políticas de Privacidade - processes: - back: Voltar - index: - process_1_button: Mais informações - process_1_description: Madrid quer lançar um sistema de transparência pública - de nível mais avançado no mundo e nós precisamos de sua ajuda. - process_1_title: Planejamento transparente - process_2_button: Mais informações - process_2_description: Contamos com você para decidir como você deseja este - novo espaço em sua cidade. - process_2_title: Remodelagem da Plaza Espanã. - process_1: - button: Comentar o planejamento - comment: deixe seus comentários - text: "Até o próximo 31 de janeiro você pode %{comment} o ante-projeto de - Orçamento Transparente da cidade de Madrid ou enviar um e-mail para transparencia@madrid.es.\r\n\r\nAgora - você pode ver o [projeto final Orçamento Transparente da Cidade de Madrid] - (/docs/ordenanza_de_transparencia_de_la_ciudad_de_madrid.doc 'Orçamento - Transparente da Cidade de Madrid')." - title: Ajude-nos a melhorar - process_2: - text: Contamos com você no preenchimento de uma enquete curta de como você - gostaria que fosse este novo espaço em sua cidade. - title: Remodelagem da Plaza de España titles: accessibility: Acessibilidade conditions: Termos de uso @@ -1290,11 +1263,6 @@ pt-BR: password: Senha submit: Verificar minha conta title: Verificar sua conta - while_unfinished_html: Enquanto terminamos, nós encorajamos você a visitar o Blog da Área de Participação Cidadã, Transparência - e Governo Aberto para saber de nossos progressos e notícias; ou a Seção - de Participação Cidadã onde você poderá decidir qual é a cidade que você - quer. proposals: create: form: @@ -1547,7 +1515,7 @@ pt-BR: create: flash: offices: Escritórios de Apoio ao Cidadão - offices_url: http://www.madrid.es/portales/munimadrid/es/Inicio/El-Ayuntamiento/Atencion-al-ciudadano/Oficinas-de-Atencion-al-Ciudadano?vgnextfmt=default&vgnextchannel=5b99cde2e09a4310VgnVCM1000000b205a0aRCRD + offices_url: http://yourcitizensupportofficesite.com success_html: Obrigado por solicitar seu código de segurança máxima (somente solicitado em votações finais). Em poucos dias nós lhe enviaremos para seu endereço relacionado nos dados que temos em arquivo. Por favor @@ -1563,7 +1531,7 @@ pt-BR: go_to_index: Ver propostas office: Verificar em qualquer %{office} offices: Escritórios de Apoio ao Cidadão - offices_url: http://www.madrid.es/portales/munimadrid/es/Inicio/El-Ayuntamiento/Atencion-al-ciudadano/Oficinas-de-Atencion-al-Ciudadano?vgnextfmt=default&vgnextchannel=5b99cde2e09a4310VgnVCM1000000b205a0aRCRD + offices_url: http://yourcitizensupportofficesite.com send_letter: Envie-me uma carta com o código title: Parabéns! user_permission_info: Com a sua conta você pode... From ece2f6f019e1f101e0859ba9a93fe305448e46c6 Mon Sep 17 00:00:00 2001 From: Alberto Garcia Cabeza Date: Mon, 4 Jul 2016 18:07:45 +0200 Subject: [PATCH 095/126] Removes Madrid references on pages --- app/views/pages/conditions.html.erb | 91 +------------------ app/views/pages/faq.html.erb | 96 ++------------------ app/views/pages/opendata.html.erb | 15 +-- app/views/pages/participation.html.erb | 72 ++++----------- app/views/pages/participation_facts.html.erb | 6 +- app/views/pages/participation_world.html.erb | 4 +- app/views/pages/privacy.html.erb | 10 +- app/views/pages/proposals_info.html.erb | 89 ++---------------- public/maintenance.html | 2 +- 9 files changed, 49 insertions(+), 336 deletions(-) diff --git a/app/views/pages/conditions.html.erb b/app/views/pages/conditions.html.erb index 642881be4..fbe53c1ca 100644 --- a/app/views/pages/conditions.html.erb +++ b/app/views/pages/conditions.html.erb @@ -4,95 +4,8 @@

<%= t("pages.conditions") %>

-

AVISO LEGAL SOBRE LAS CONDICIONES DE USO, PRIVACIDAD Y PROTECCIÓN DE DATOS PERSONALES DEL PORTAL DE GOBIERNO ABIERTO DEL AYUNTAMIENTO DE MADRID

- -

1. Ámbito de aplicación de las condiciones de uso

-

La participación (entendiéndola como participación activa más allá de la lectura del contenido presente) en el Portal de Gobierno Abierto del Ayuntamiento de Madrid se regula por las presentes condiciones de uso que vinculan a todas las personas que participen en este sitio web. Por ello, cualquier persona que desee participar deberá registrarse, a cuyo fin se solicitará la aceptación de estas condiciones de uso.

-

El Ayuntamiento de Madrid se reserva la facultad de modificar las presentes condiciones de uso para la participación en el Portal de Gobierno Abierto del Ayuntamiento de Madrid, cuya última versión se publicará en este sitio web.

-

La participación en el Portal de Gobierno Abierto del Ayuntamiento de Madrid se regula por las presentes condiciones de uso que vinculan a todas las personas que participen en este sitio web. Cualquier persona que desee participar deberá registrarse, a cuyo fin se solicitará la aceptación de estas condiciones de uso.

-

El Ayuntamiento de Madrid se reserva la facultad de modificar las presentes condiciones de uso del Portal de Gobierno Abierto del Ayuntamiento de Madrid cuya última versión se publicará en este sitio web.

- - -

2. Objetivo de la iniciativa

-

A través del Portal de Gobierno Abierto, el Ayuntamiento de Madrid quiere fomentar la participación de los ciudadanos en la gestión de la ciudad, implicándoles en la generación de ideas y propuestas novedosas y viables, con el objeto de mejorar su calidad de vida. Es una apuesta decidida por una gestión más cercana a los ciudadanos que permitirá recibir sus propuestas y además, crear canales directos de comunicación con el gobierno municipal, contribuyendo a tomar las decisiones más acertadas para el interés general.

-

3. Cuestiones generales sobre la participación en el Portal de Gobierno Abierto del Ayuntamiento de Madrid

-

Podrá participar cualquier persona física a partir de los 16 años que se haya registrado previamente en el Portal de Gobierno Abierto. Mediante la aceptación de estas condiciones de uso se declara tener 16 años o más. Los mayores de edad a cuyo cargo se encuentran los menores, son los plenos responsables de la actuación que tengan éstos en el Portal de Gobierno Abierto. No existe limitación en cuanto al número de debates, comentarios o propuestas a presentar por los participantes.

-

Al introducir el título de las propuestas, se recomienda escribir una descripción breve y precisa con un máximo de 2000 caracteres. Para completar la argumentación se podrán asociar documentos adjuntos o de las Redes Sociales Vimeo, Youtube, Slideshare, Flickr o SoundCloud.

- -

4. Obligaciones de los usuarios del Portal de Gobierno Abierto

-

Al ser el Ayuntamiento de Madrid un punto de encuentro cuyo objetivo es debatir, y compartir y valorar propuestas relacionadas con la mejora de la ciudad, los usuarios están obligados a hacer un uso diligente y acorde a dicho objetivo.

-

El Ayuntamiento de Madrid no es responsable del uso incorrecto del Portal de Gobierno Abierto por los usuarios o de los contenidos localizados en el mismo, siendo cada usuario responsable de su uso correcto y de la legalidad de los contenidos y opiniones que haya compartido.

-

El Ayuntamiento de Madrid se reserva, por lo tanto, el derecho a limitar el acceso al Portal de Gobierno Abierto del Ayuntamiento de Madrid de opiniones, informaciones, comentarios o documentos que los usuarios quieran incorporar, pudiendo instalar filtros a tal efecto. Todo ello se realizará únicamente mientras tenga el fin de preservar el objetivo fundamental del Portal de Gobierno Abierto.

-

De acuerdo a la normativa legal vigente queda prohibida la utilización del Portal de Gobierno Abierto del Ayuntamiento de Madrid con fines distintos a los de debatir, compartir y valorar propuestas, y específicamente:

-

Compartir cualquier contenido que pueda ser considerado como una vulneración en cualquier forma de los derechos fundamentales al honor, imagen e intimidad personal y familiar de terceros o contra la dignidad de las personas.

-

Compartir imágenes o fotografías que recojan imágenes o datos personales de terceros sin haber obtenido el oportuno consentimiento de sus titulares.

-

Compartir cualquier contenido que vulnere el secreto en las comunicaciones, la infracción de derechos de propiedad industrial e intelectual o de las normas reguladoras de la protección de datos de carácter personal.

-

Reproducir, distribuir, compartir contenidos, informaciones o imágenes que hayan sido puestas a disposición por otros usuarios sin la autorización expresa de estos.

-

Su utilización con fines de publicidad.

-

La realización de cualquiera de los anteriores comportamientos permitirá al Ayuntamiento de Madrid suspender temporalmente la actividad de un participante, inhabilitar su cuenta o borrar su contenido, sin perjuicio de otras responsabilidades que puedan ser reclamadas.

-

En caso de que el contenido introducido por los usuarios incorpore un enlace a otro sitio web, el Ayuntamiento de Madrid no será responsable por los daños o perjuicios derivados del acceso al enlace o a sus contenidos.

-

En caso de litigio de cualquier clase o por cualquier motivo entre los participantes en el sitio web y/o un tercero, el Ayuntamiento de Madrid quedará exento de cualquier responsabilidad por reclamaciones, demandas o daños de cualquier naturaleza relacionados o derivados del litigio.

- -

5. Uso del Portal de Gobierno Abierto

-

Los participantes podrán acceder y navegar por el Portal de Gobierno Abierto libremente y de forma anónima. Sólo cuando quieran realizar alguna acción que implique la creación, apoyo o comentario de una propuesta, o a la participación en un debate, se le solicitará que introduzca sus credenciales, para cuya obtención será necesario registrarse previamente. El registro que permitirá participar comentando en cualquiera de las secciones, creando debates o propuestas, se realizará introduciendo los siguientes datos:

-
    -
  • Nombre de usuario
    • -
  • Correo electrónico
    • -
  • Aceptación de las condiciones de uso de el Portal de Gobierno Abierto
    • -
-

El Portal de Gobierno Abierto también permite la identificación mediante el usuario de Facebook, Twitter y Google+.

-

Para participar apoyando propuestas, al usuario se le requerirá que verifique su cuenta cumpliendo que tiene 16 años o más y está empadronado en Madrid, para lo cual se le guiará a través de una serie de pasos donde se le solicitarán datos relativos al padrón y un medio de comunicación a través del cual facilitarle uno o dos códigos seguros para completar la verificación de su cuenta (dependiendo del medio de comunicación elegido por el usuario).

- -

El usuario podrá interactuar con la herramienta interviniendo, al menos, de las siguientes formas:

-

1. DEBATES

-

En el apartado de debates el usuario podrá participar:

-
    -
  • Creando un debate. Cada usuario podrá abrir uno o más debates. Los debates serán publicados automáticamente.
    • -
  • Votando de manera positiva o negativa a los debates creadas por los usuarios. Los debates aparecerán con los votos positivos y negativos recibidos. Cada usuario podrá exclusivamente votar o bien positivo o bien negativo, y una vez a un mismo debate.
    • -
  • Comentando los debates del resto de usuarios. Cada debate podrá ser comentado por el resto de usuarios.
    • -
-

2. PROPUESTAS

-

En el apartado de propuestas ciudadanas el usuario podrá participar:

-
    -
  • Creando una propuesta. Cada usuario podrá dar de alta una o más propuestas. Las propuestas serán publicadas automáticamente.
    • -
  • Apoyando las propuestas creadas por los usuarios. Las propuestas aparecerán con el número de apoyos recibidos. Cada usuario podrá exclusivamente apoyar una vez a una misma propuesta. Cuando una propuesta reciba apoyos equivalente al 2% del padrón de personas con 16 años o más, la propuesta pasará a una fase posterior donde durante una semana se invitará a la ciudadanía a aceptarla o rechazarla como propuesta colectiva.
    • -
  • Comentando las propuestas del resto de usuarios. Cada propuesta podrá ser comentada por el resto de usuarios, pudiendo argumentar las razones del apoyo o introducir mejoras a la misma.
    • -
- -

6. Condiciones para el tratamiento de los contenidos proporcionados por los usuarios

-

Las presentes condiciones regulan los términos aplicables al contenido remitido por los usuarios de esta plataforma a través del formulario correspondiente (en adelante, el contenido). Estas condiciones se aplican tanto al contenido inicialmente remitido al Portal de Gobierno Abierto como a cualquier contenido que se envíe con posterioridad o se manifieste al Ayuntamiento de Madrid, debiendo significarse lo siguiente:

-
    -
  • A. No Confidencialidad: Todo el contenido remitido por el usuario al Ayuntamiento de Madrid deberá ser susceptible de ser conocido por el público en general. Por lo tanto, el Ayuntamiento de Madrid tratará el citado contenido como información no confidencial.
    • -
  • B. Procedimiento: En el caso de que el Ayuntamiento de Madrid esté interesado en el contenido remitido por el usuario, se pondrá en contacto con él para solicitarle información adicional. Dicha información tendrá asimismo carácter de no confidencial, sin perjuicio de que en el caso de que las partes consideren la necesidad de intercambiarse información de carácter confidencial se firme el correspondiente Acuerdo de Confidencialidad.

    - El Ayuntamiento de Madrid se reserva el derecho de no contactar con los usuarios que le hubieran remitido el contenido. Todo ello sin perjuicio de lo establecido en el apartado relativo a "Derechos de Propiedad Intelectual e industrial".

    - En el supuesto que el Ayuntamiento de Madrid, a su entera discreción, decidiera contactar con determinados usuarios, éstos conocen y aceptan que por ello el Ayuntamiento de Madrid no adquiere compromiso alguno.
    • - -
  • C. Publicidad o difusión de los contenidos presentados: Los participantes en el Portal de Gobierno Abierto del Ayuntamiento de Madrid declaran conocer y aceptar el hecho de que la información aportada podrá ser publicada en la web www.madrid.es, así como a través de otros medios que la organización considere oportunos para dar a conocer esta iniciativa.
    • - -
  • D. No devolución material: El Ayuntamiento de Madrid carece de obligación alguna de devolver el Contenido remitido por los usuarios.
    • -
  • E. Procedimiento de aviso y retirada: El Ayuntamiento de Madrid procesará las peticiones de eliminación o retirada de contenidos que incumplan las condiciones de uso que hayan añadido los participantes. Asimismo, cualquier persona, con motivos razonados si existe incumplimiento de las presentes condiciones de uso, podrá solicitar la retirada de contenidos al Ayuntamiento de Madrid. El Ayuntamiento de Madrid se reserva el derecho de hacer las comprobaciones o verificaciones oportunas con carácter previo a la retirada de cualquier contenido.
    • -
- -

7. Política de privacidad y protección de datos

-
    -
  • A. Titularidad de los derechos de propiedad intelectual e industrial: El usuario que aporta el Contenido declara, con la aceptación de las presentes Condiciones, ser titular de los derechos de propiedad intelectual y/o industrial u ostentar derechos suficientes sobre dicho contenido y que además lo remite al Ayuntamiento de Madrid de forma voluntaria para su divulgación en el Portal de Gobierno Abierto del Ayuntamiento de Madrid.

    - La titularidad de todos y cada uno de los Contenidos presentados que se encuentren protegidos o sean susceptibles de encontrarse protegidos, por el Derecho de la Propiedad Industrial e Intelectual, corresponde a los autores y/o titulares de los mencionados Contenidos.

    - El Ayuntamiento de Madrid no asume responsabilidad alguna, ya sea directa o indirecta, respecto de cualquier tipo de controversia, disputa y/o litigio que pudiera derivarse de la publicación, divulgación y/o difusión de los contenidos aportados sin el preceptivo consentimiento de sus legítimos titulares.

    - El Ayuntamiento de Madrid respetará todos los Derechos de Propiedad Intelectual o Industrial sobre el contenido remitido por los usuarios. Cualquier vulneración de los Derechos de Propiedad Intelectual o Industrial será responsabilidad de la persona que aporte el contenido.

    - El Ayuntamiento de Madrid, por la mera recepción del contenido, no recibe del usuario licencia alguna de propiedad intelectual o industrial, por lo que no hará uso del contenido salvo aceptación expresa de su titular.
    • -
  • B. Protección de datos: Los datos personales aportados por los usuarios que se registren en el Portal de Gobierno Abierto, serán incorporados y tratados en el fichero Gestión de Procesos Participativos, cuya finalidad es gestionar los procesos participativos para el control de la habilitación de las personas que participan en los mismos y recuento meramente numérico y estadístico de los resultados derivados de los procesos de participación ciudadana. Gestión de Agendas para convocatorias y envío de información solicitada. El órgano responsable del fichero es la Dirección General competente en materia de Participación Ciudadana, ante la que la persona interesada podrá ejercer los derechos de acceso, rectificación, cancelación y oposición, todo lo cual se informa en cumplimiento del artículo 5 de la Ley Orgánica 15/1999, de 13 de diciembre, de Protección de Datos de Carácter Personal.
    • -
- -

Como principio general, los datos personales no serán comunicados a terceros, excepto cuando la comunicación haya sido autorizada por el usuario, o la información sea requerida por la autoridad judicial, ministerio fiscal o la policía judicial, o se de alguno de los supuestos regulados en el artículo 11 de la Ley Orgánica 15/1999, de 13 de diciembre, de Protección de Datos de Carácter Personal.

-
    -
  • Los derechos de acceso, rectificación, cancelación y oposición, se podrán ejercitar dirigiendo una comunicación por escrito al Ayuntamiento de Madrid, Área de Gobierno de Participación Ciudadana, Transparencia y Gobierno Abierto, Dirección General de Participación Ciudadana.
    • -
- -

8. Normativa aplicable

-

Las normas del ordenamiento jurídico español rigen de manera exclusiva estas condiciones de uso. Cualquier disputa, controversia o reclamación derivada de estas condiciones de uso, o el incumplimiento, rescisión o invalidación de estas, se resolverán exclusivamente ante los juzgados competentes.

- -

9. Revisión de las condiciones de uso

-

El Ayuntamiento de Madrid se reserva el derecho de revisar las presentes condiciones de uso y la política de privacidad en cualquier momento y por cualquier razón. En dicho caso, los usuarios registrados serán avisados a través de este espacio en línea y, si continúan utilizando el Portal de Gobierno Abierto, se entenderán aceptadas las modificaciones introducidas.

+

AVISO LEGAL SOBRE LAS CONDICIONES DE USO, PRIVACIDAD Y PROTECCIÓN DE DATOS PERSONALES DEL PORTAL DE GOBIERNO ABIERTO

+

Página de información sobre las condiciones de uso, privacidad y protección de datos personales.

diff --git a/app/views/pages/faq.html.erb b/app/views/pages/faq.html.erb index b8b6a20ab..f48864a91 100644 --- a/app/views/pages/faq.html.erb +++ b/app/views/pages/faq.html.erb @@ -3,98 +3,22 @@ <%= render "shared/back_link" %>
-

Soluciones a problemas técnicos (FAQ)

-

Te presentamos una lista de las soluciones a los problemas y dudas técnicas más frecuentes del Portal de Gobierno Abierto. Si esto no resuelve tu problema, puedes llamar al 010 (o a su versión grauita 915298210) o acercarte a cualquiera de las 26 Oficinas de Atención al Ciudadano que tienes en Madrid.

+

Preguntas Frecuentes (FAQ)

-

No me funciona la verificación de residencia.

-

Comprueba las siguientes posibilidades:

-
    -
  • ¿Has puesto el DNI o documento con todos los caracteres juntos, incluyendo la letra al final?
    • -
  • ¿Estás seguro de que estás empadronado en el municipio de Madrid? (el municipio es geográficamente más pequeño que la Comunidad de Madrid).
    • -
  • Puede que haya algún problema en el registro de empadronamiento con tus datos. Por favor llama al 010 (o a su versión grauita 915298210) y confirma que tu información de Padrón es correcta.
    • -
  • Si todo lo anterior no soluciona el problema, puedes acercarte a cualquiera de las 26 Oficinas de Atención al Ciudadano que hay por todo Madrid, y te lo resolverán en el acto.
    • -
+

Pregunta frecuente 1

+

Texto de respuesta para la pregunta frecuente 1.

-

No estoy empadronado en Madrid ¿por qué no puedo participar?

-

El apoyo y votación de propuestas está limitado a la gente empadronada en Madrid, ya que se trata de tomar decisiones que afectarán al municipio y a los que viven en él, y por tanto nos parece que son ellos los que tienen que tomar la decisión final. Es cierto que hay personas que no están empadronadas en Madrid y que aun así les pueden afectar esas decisiones, pero el Padrón es el censo más amplio del que disponemos que nos permite que el proceso de participación sea seguro y lleguemos al máximo posible de personas. No obstante, sí que es posible participar aunque no se esté empadronado. La sección de debates está abierta a todo el mundo, y también es posible lanzar una propuesta, o comentar las propuestas existentes sin necesidad de estar empadronado. Sólo la decisión sobre las propuestas (apoyos y votaciones) están limitadas a la gente empadronada.

+

Pregunta frecuente 2

+

Texto de respuesta para la pregunta frecuente 2.

-

¿Para qué sirve verificar mi cuenta? ¿qué es esto de la carta con un código que me vais a mandar?

-

Para usar la web necesitamos una cuenta de usuario, que podrá hacer más o menos cosas según esté más o menos verificada:

-
    -
  • Si nos registramos en la web con nuestro correo electrónico y no damos ningún dato más (no hacemos el proceso de verificación de residencia) podremos:
    • -
- -

Participar en debates

-

Crear propuestas

- -
    -
  • Si despues de registrarnos realizamos la verificación básica (a través de la web consiste en verificar la residencia y dar un móvil para que nos manden un código de confirmación; ver información detallada del proceso en la sección "¿Cómo creo y verifico mi cuenta?" será posible:
    • -
- -

Participar en debates

-

Crear propuestas

-

Apoyar propuestas

- -
    -
  • Si realizamos la verificación completa de nuestra cuenta (esto se puede realizar presencialmente en cualquiera de las 26 Oficinas de Atención al Ciudadano que hay por todo Madrid, o después de realizar la verificación básica pulsando en el enlace "Solicitar una carta por correo postal" que nos mandará a casa una carta con un código y unas instrucciones muy sencillas para terminar de verificarnos completamente) nos será posible realizar todas las acciones:
    • -
- -

Participar en debates

-

Crear propuestas

-

Apoyar propuestas

-

Votar propuestas

- -

Recuerda que la votación de propuestas es un proceso muy concreto que sólo ocurre durante una semana una vez las propuestas han llegado al 2% de apoyos, por lo tanto por lo general será posible realizar todas las acciones en la web con la verificación básica de nuestra cuenta.

- -

También es importante recalcar que podemos crear y verificar completamente nuestra cuenta sin pasar por Internet, realizando el proceso completamente de manera presencial en cualquiera de las 26 Oficinas de Atención al Ciudadano que hay por todo Madrid. - -

¿Necesito teléfono móvil o acceso a Internet para poder participar?

-

No. Todas las acciones relacionadas con las propuestas, tanto crearlas, como apoyarlas, votarlas o informarnos sobre ellas, es algo que podemos hacer presencialmente en cualquiera de las 26 Oficinas de Atención al Ciudadano que hay por todo Madrid, simplemente presentando nuestro DNI, pasaporte o tarjeta de residencia (recuerda que para apoyar o votar propuestas es necesario estar empadronado en Madrid). Además podremos presentar hojas de firmas para apoyar una propuesta concreta. También podremos crearnos una cuenta de usuario completamente verificada, en caso de que optemos en algún momento por utilizar la web directamente. -

- -

¿Cómo creo y verifico mi cuenta?

-
    -
  • Lo primero es crear una cuenta básica. Para ello hacemos clic en el enlace Registrarse y rellenamos los datos que nos piden. Es un requisito marcar la casilla de aceptación de las condiciones de uso. Al crear una cuenta nos llegará un correo electrónico a la dirección que hayamos especificado, y tendremos que hacer click en el enlace que contiene (el enlace que pone "Confirmar mi cuenta") para terminar de crear la cuenta.
    • -
  • Una vez creada la cuenta básica, y tras entrar con nuestro correo y contraseña, el sistema nos dará la opción de realizar una verificación básica de la misma. Tanto este paso como el siguiente se pueden realizar presencialmente en cualquiera de las 26 Oficinas de Atención al Ciudadano que hay por todo Madrid. Si preferimos hacerlo a través de la web, hacemos click en el enlace "Mi cuenta" de la parte superior derecha, y luego en el botón "Verificar mi cuenta". Lo primero que se nos pedirá es que introduzcamos nuestros datos de residencia, para verificar que estamos empadronados en el municipio de Madrid (es importante introducir el número de documento con la letra; y marcar la casilla de aceptación de acceso al Padrón). Si los datos son correctos, se nos pedirá un teléfono móvil para mandarnos un código de confirmación, que introduciremos en la siguiente página que se nos presente. Este móvil no se utilizará para contactarnos ni para enviarnos nada en ningún momento, sólo es una medida de seguridad. Si preferimos no dar ningún teléfono móvil, podemos realizar el proceso sin necesidad de él en las Oficinas de Atención al Ciudadano, como comentamos anteriormente. Una vez introducido correctamente el código de confirmación, nuestra cuenta nos permitirá apoyar propuestas.
    • -
  • Para poder acceder a las votaciones finales de las propuestas, tendremos que verificar completamente nuestra cuenta. No obstante recuerda que la votación de propuestas es un proceso muy concreto que sólo ocurre durante una semana una vez las propuestas han llegado al 2% de apoyos, por lo tanto por lo general será posible realizar todas las acciones en la web con la anterior verificación básica de nuestracuenta. Para verificar completamente nuestra cuenta, podemos hacerlo presencialmente en cualquiera de las 26 Oficinas de Atención al Ciudadano, o bien a través de la web entrando con nuestro correo y contraseña, hacer clic en el enlace "Mi cuenta" de la parte superior derecha, pulsar el botón "Finalizar verificación", y finalmente hacer click en "Solicitar el envío de un correo postal". Una vez solicitado, nos llegará a nuestra dirección de empadronamiento una carta, con un código de seguridad y unas sencillas instrucciones para realizar la verificación.
    • -
- -

¿Cómo puedo enviar una propuesta al Ayuntamiento? ¿Puedo mandaros directamente mi propuesta a alguno de los correos electrónico que aparecen en la web de participación?

-

El camino correcto para hacer una propuesta es añadirla uno mismo directamente en la web de participación dentro de la sección "Propuestas" (para ello es necesario primero crear una cuenta haciendo click en el enlace Registrarse, y una vez creada, hacer click en el botón "Crear propuesta" de la sección "Propuestas"), o presencialmente a través de cualquiera de las 26 Oficinas de Atención al Ciudadano que hay por todo Madrid. En caso de que lo que queremos presentar sea una sugerencia o reclamación, la información para presentarlas se encuentra en esta página. - -

Hay muchas propuestas parecidas, ¿no se podrían unificar?

-

En breve implementaremos una nueva funcionalidad de la web que permitirá marcar propuestas similares como tales, y que se muestren al visualizar cualquiera de ellas. De esta forma la gente podrá decidir cuál de ellas apoyar tras compararlas, y ayudará a que no se dispersen tanto los apoyos y no se repitan tanto las mismas propuestas. También implementaremos un sistema que cuando creemos nuestra propuesta nos mostrará propuestas similares, por si la idea que queremos lanzar ya existiera en el portal de participación.

- -

Sobre la posibilidad de unificar propuestas, lo que pueden parecer pequeñas diferencias entre dos propuestas similares, pueden marcar grandes diferencias a la hora de hacerlas realidad. Por ello hay personas que pueden querer apoyar una de ellas y no otras. Es por eso que debemos respetar los apoyos particulares que haya dado la gente, y no unificar las propuestas. Esto es independiente de que los autores de las propuestas quieran unirlas. Una vez las propuestas están recibiendo apoyos pasan a ser tanto de la gente que las apoya como de sus autores.

- -

Me he olvidado de mi contraseña o no me funciona ¿qué puedo hacer?

-
    -
  • Puedes hacer solicitar un nueva contraseña para que se te envíe una nueva contraseña a tu correo electrónico.
    • -
  • Si la anterior solución no funcionan, puedes acercarte a cualquiera de las 26 Oficinas de Atención al Ciudadano que hay por todo Madrid, donde te resolverán el problema presencialmente solucionando el problema asociado a tu cuenta o creándote una cuenta nueva.
    • -
- -

No consigo crear mi cuenta correctamente.

- - -

¿Cómo puedo cambiar mi correo electrónico, mi nombre de usuario, mi contraseña, darme de baja o activar/desactivar las notificaciones que me llegan al correo electrónico?

-

Haz click en el enlace "Entrar", introduce tu correo electrónico y tu contraseña, y pulsa el botón "Entrar". Una vez hecho esto, haz click en el enlace "Mi cuenta" donde encontrarás todas las opciones que te permitirán cambiar tu correo electrónico, nombre de usuario, contraseña, darte de baja o activar/desactivar las notificaciones. Una vez realizado el cambio adecuado asegúrate de hacer click en el botón "Guardar cambios".

+

Pregunta frecuente 3

+

Texto de respuesta para la pregunta frecuente 3.

diff --git a/app/views/pages/opendata.html.erb b/app/views/pages/opendata.html.erb index 496ae5938..aeee6b465 100644 --- a/app/views/pages/opendata.html.erb +++ b/app/views/pages/opendata.html.erb @@ -1,13 +1,10 @@ <% provide :title do %><%= t('pages.titles.opendata') %><% end %> -
-
+
+

<%= t("pages.opendata.title") %>

-

<%= t("pages.opendata.slogan_html") %>

- <%= link_to t("pages.opendata.go_old"), t("layouts.header.external_link_opendata_url"), - title: t('shared.target_blank_html'), - target: "_blank", class: "button" %> +

<%= t("pages.opendata.slogan") %>

@@ -15,9 +12,3 @@
- -
-
-

<%= t('pages.while_unfinished_html') %>

-
-
diff --git a/app/views/pages/participation.html.erb b/app/views/pages/participation.html.erb index 5e274986c..9d92140fb 100644 --- a/app/views/pages/participation.html.erb +++ b/app/views/pages/participation.html.erb @@ -6,79 +6,41 @@
  • I. Participación
  • II. Transparencia
    • -

    Participación y Transparencia en Madrid - Próximas novedades

    +

    Participación y Transparencia

    -

    Desde el nuevo gobierno del Ayuntamiento de Madrid ponemos en marcha un nuevo proyecto de participación y transparencia, desarrollado a través de la recién creada área de gobierno: Participación Ciudadana, Transparencia y Gobierno Abierto. El objetivo de este nuevo proyecto es claro: que los madrileños puedan decidir directamente la política de la ciudad, y que todo lo que ocurra en el Ayuntamiento, hasta el último rincón, esté a la vista de todos.

    - -

    Este nuevo área de gobierno también es la encargada de la atención al ciudadano, de las sugerencias y reclamaciones, de la evaluación y calidad de las políticas y gestión del Ayuntamiento, de la administración electrónica y otros temas relacionados con la relación entre ciudadanía e institución.

    - -

    Iremos publicando nuestros avances, las novedades y cualquier otra cosa que queramos compartir con vosotros en relación con el proyecto en nuestro blog.

    - -

    Podéis escribirnos para lo que queráis a ag.gobiernoabierto@madrid.es

    - -

    A continuación os presentamos algunas de las principales novedades que tenemos planeadas poner en marcha en relación con el proyecto de participación y transparencia, aparte de las que vayamos diseñando o se nos vayan proponiendo durante la legislatura:

    +

    Página de información sobre Participación y Transparencia.

    I. Participación.

    +
      -
    • I.1. Propuestas ciudadanas. Un espacio que permite que entre todos decidamos qué debe ser Madrid. Cualquiera puede presentar propuestas, que en caso de que sean aceptadas mayoritariamente se llevarán a cabo por parte del Ayuntamiento. Debate, propón, decide.
      • - -
    • I.2. Presupuestos participativos. Parte del presupuesto de inversión del Ayuntamiento (el que no está comprometido ya con necesidades básicas como pueden ser los servicios sociales o las emergencias), será reservado para ser decidido su uso por la ciudadanía. La gente hará propuestas, se tasarán las más apoyadas, y luego los ciudadanos decidirán en cuáles de esos proyectos priorizar el presupuesto reservado.
      • - -
    • I.3. Legislacion colaborativa. A través de diferentes fases de participación, la ciudadanía tendrá un papel fundamental colaborando directamente en la elaboración de las propuestas, reglamentos, decretos o cualquier otro tipo de trabajo político desarrollado por el gobierno municipal. Una participación real desde el principio al fin del proceso legislativo, desde decidir los expertos en la materia hasta revisar el texto final.
      • - -
    • I.4. Co-gobierno ciudadano. Mediante este sistema la ciudadanía podrá decidir las líneas prioritarias de actuación del Ayuntamiento a medio plazo.
      • - -
    • I.5. Participación sectorial. La participación ciudadana se va a tratar de manera transversal en todas las áreas de gobierno del Ayuntamiento, afectando a todos los procesos que se lleven a cabo. Un ejemplo de esto es el proceso de auditoría ciudadana de la deuda, que llevaremos a cabo con el Área de Gobierno de Economía y Hacienda.
      • - -
    • I.6. Inclusión, neutralidad y privacidad. Una de las misiones principales del área será velar por la inclusión de todo el mundo en los procesos participativos, para que todas las voces y voluntades formen parte de ellos y no se quede nadie fuera. Para ello, desarrollaremos una mesa de inclusión a la que invitaremos a todos los expertos, colectivos y asociaciones que trabajen con colectivos excluidos, para diseñar las maneras adecuadas de superar estas brechas. La protección de la participación se complementará con la protección de la neutralidad y privacidad en todos los procesos, para asegurar su legitimidad y confianza.
      • - -
    • I.7. Innovación social. Pretendemos crear un entorno que movilice la inteligencia colectiva existente en favor de una ciudad más hospitalaria e inclusiva. Espacios donde la sociedad se hable y piense con la administración, con la convicción de que son los ciudadanos quienes mejor conocen sus problemas, y es en lo colectivo donde están los expertos que pueden hallar las soluciones.
      • +
    • I.1. Participación. Información sobre Participación
      • +
    • I.1. Participación. Información sobre Participación
      • +
    • I.1. Participación. Información sobre Participación
    +

    II. Transparencia

    +
      -
    • II.1. Ordenanza de transparencia - Este ayuntamiento cree en la transparencia como medio para conseguir objetivos claves para el desarrollo de la democracia. En la práctica, el derecho de acceso a la información tiene un efecto disuasorio y preventivo sobre la corrupción. Además tiene un impacto directo sobre los derechos democráticos más esenciales como es el derecho a la participación, desde su concepción más básica como es votar en las elecciones, el derecho a una prensa libre e independiente o sobre todo nuestro derecho a obtener o a exigir una rendición de cuentas completa de lo público.
      - El Ayuntamiento de Madrid se propone aprobar una norma de transparencia que incluya los principios más avanzados en esta materia y que incluya la obligación de las instituciones públicas hacer pública, reactiva o proactivamente, toda la información, registrada, archivada, elaborada, recibida o en posesión de las autoridades públicas sea cual sea el formato. Se trata de explicar todo lo que afecte a una decisión sobre lo público: qué se hace, quién lo hace, por qué se hace, cómo se hace y cuánto cuesta. Además esta información debe ser publicada en formatos abiertos que la hagan más accesible y reutilizable por cualquiera.
      • - -
    • II.2. Portal de transparencia - En cumplimiento de la Ley 19/2013 de Transparencia, Acceso a la Información y Buen Gobierno, y de su futura implementación en una Ordenanza Municipal en Madrid, el Ayuntamiento de Madrid plantea el desarrollo y mejora del Portal de la Transparencia. El Ayuntamiento no se limitará a cumplir con las obligaciones que se adquieran cuando entre en vigor la ley 19/2013 sino que aprobará mediante su Ordenanza las obligaciones y derechos que posibiliten la publicación de una lista de la información más ambiciosa que debe encontrarse en el Portal de transparencia del Ayuntamiento siguiendo los mandatos legales.
      - El objetivo de esta mejora es no solo la publicación de un mayor volumen de información sino también la publicación de esta información en formatos que la hagan más accesible y fácil de entender para los ciudadanos.
      • - -
    • II.3. Datos abiertos - El Ayuntamiento tiene como objetivo compartir todos los datos que tienen en su poder en formatos abiertos y fomentar su reutilización por parte de la sociedad. El objetivo por tanto es doble, por un lado se trabajará en la mejora del portal de datos, en aumentar la cantidad, la calidad y la frecuencia en la publicación de datos, y por otro lado se abrirán canales de colaboración para promover las aplicaciones y los usos que resulten de la reutilización de los datos.
      • - -
    • II.4. Agendas públicas - En el moderno proceso de toma de decisiones por los responsables políticos, la publicación de las agendas de los cargos públicos es una medida fundamental para garantizar la transparencia de las instituciones. De esta forma, la ciudadanía puede tener una idea clara de quiénes participan en el proceso de toma de decisiones.
      - Esta necesidad de publicidad viene refrendada por destacados organismos internacionales, como el Grupo de Estados Contra la Corrupción del Consejo de Europa (GRECO), que la señala como uno de los estándares internacionales a tener en cuenta para incorporar al sistema parlamentario español; o la Organización para la Cooperación y el Desarrollo Económico (OCDE) que, en junio de 2013, destacaba que "en el despertar de una crisis global donde la protección del interés público ha sido cuestionada de forma mundial, hay una creciente necesidad de valorar el progreso alcanzado para garantizar un proceso de toma de decisiones abierto, balanceado y con un público informado".
      - En línea con este espíritu de apertura, y con la decidida voluntad de que exista fluidez en la información, se considera necesario hacer públicas las agendas de los Concejales como inicio de una política de transparencia y rendición de cuentas en el Ayuntamiento de Madrid, de forma que sea posible saber qué trabajo realizan los miembros del gobierno municipal y qué colectivos o circunstancias pueden tener repercusión en las decisiones que se toman.
      - Ya se pueden consultar las agendas de los concejales pero el Ayuntamiento está trabajando en una aplicación mejor que permita encontrar las reuniones más fácilmente.
      • - -
    • II.5. Transparencia del Lobby - Con el objetivo de hacer el proceso de toma de decisiones del Ayuntamiento de Madrid un proceso lo más transparente posible, se propone la creación de un registro de lobbies que obligue a todas las personas que quieran reunirse con el Gobierno para ejercer influencia sobre los asuntos públicos a estar registrada en el mismo. El objetivo de este registro es conocer a qué intereses representan las personas que se reúnen con los representantes públicos.
      • +
    • II.1. Transparencia Información sobre Transparencia
      • +
    • II.1. Transparencia Información sobre Transparencia
      • +
    • II.1. Transparencia Información sobre Transparencia
    - diff --git a/app/views/pages/participation_facts.html.erb b/app/views/pages/participation_facts.html.erb index 579638028..9a52f6a6c 100644 --- a/app/views/pages/participation_facts.html.erb +++ b/app/views/pages/participation_facts.html.erb @@ -1,13 +1,9 @@
    -
    +
    <%= render "shared/back_link" %>

    Hechos sobre participación ciudadana y democracia directa

    -
    - -
    -

    La democracia directa produce gente más informada y con más cultura política.

    El poner en marcha mecanismos de participación reales hace que la gente se preocupe por las decisiones que tiene que tomar, y que por lo tanto se informe sobre ellas. Esto se observa sistemáticamente al comparar diferentes regiones de un mismo país con diferentes grados de democracia directa, o en procesos particulares como por ejemplo la votación del Tratado por una Constitución para Europa, comparando los países que lo votaron en referéndum y los que no.

    En ocasiones se argumenta que no se deben crear mecanismos de decisión ciudadana, porque un posible bajo nivel cultural o de conocimiento político haría que se tomaran malas decisiones. Esto se ha argumentado tradicionalmente en contra del voto femenino, del voto inmigrante, del voto de la gente sin renta, etc. pero lo que se ha demostrado es que permitir a toda esa gente decidir ha sido precisamente lo que ha permitido que escaparan de su situación de desigualdad cultural y de derechos, o al menos que la mejoraran considerablemente.

    diff --git a/app/views/pages/participation_world.html.erb b/app/views/pages/participation_world.html.erb index 57ad94c7b..38ab0275d 100644 --- a/app/views/pages/participation_world.html.erb +++ b/app/views/pages/participation_world.html.erb @@ -10,13 +10,13 @@

    Participación ciudadana directa en el mundo

    -

    En el mundo existen sistemas de participación ciudadana muy similares al que vamos a implementar en Madrid, que llevan funcionando desde hace más de cien años y en países muy diferentes. La experiencia larga y variada de dichos sistemas demuestra que lo que ponemos en marcha en Madrid tendrá un impacto muy positivo en la sociedad, como ha tenido en esos otros países.

    +

    En el mundo existen sistemas de participación ciudadana que llevan funcionando desde hace más de cien años y en países muy diferentes. La experiencia larga y variada de dichos sistemas demuestra el impacto muy positivo en la sociedad que ha tenido en esos otros países.

    Además de los ejemplos clásicos, como Suiza, asistimos a un desarrollo muy fuerte de los sistemas de participación ciudadana en todo el mundo, en particular en los últimos años, gracias especialmente a las nuevas posibilidades que nos brinda Internet. Islandia, Finlandia, Brasil, Estados Unidos, son algunos de los países que más están apostando por una participación directa de la ciudadanía en la toma de decisiones.

    La nueva ola global de participación ciudadana

    -

    Las nuevas formas de participación se están dirigiendo principalmente a que sean la ciudadanía quien decida qué caminos debe tomar la política de su país, a través de mecanismos de iniciativas ciudadanas. Finlandia es uno de los países donde se están desarrollando nuevas herramientas similares al nuevo portal de gobierno abierto de Madrid. Su plataforma Open Ministry permite a la población presentar y apoyar propuestas, y ha conseguido por ejemplo que se apruebe gracias a él la ley de matrimonio igualitario. Islandia también ha tenido una gran repercusión desde 2011, cuando lanzaron su plataforma Better Reykjavik, que ha permitido que el 58% de la población participe en el proceso de propuestas, seleccionando cada mes las 15 ideas más votadas.

    +

    Las nuevas formas de participación se están dirigiendo principalmente a que sean la ciudadanía quien decida qué caminos debe tomar la política de su país, a través de mecanismos de iniciativas ciudadanas. Finlandia es uno de los países donde se están desarrollando nuevas herramientas similares al nuevo portal de gobierno abierto. Su plataforma Open Ministry permite a la población presentar y apoyar propuestas, y ha conseguido por ejemplo que se apruebe gracias a él la ley de matrimonio igualitario. Islandia también ha tenido una gran repercusión desde 2011, cuando lanzaron su plataforma Better Reykjavik, que ha permitido que el 58% de la población participe en el proceso de propuestas, seleccionando cada mes las 15 ideas más votadas.

    Estonia es uno de los países que gracias a una apuesta clara por las nuevas tecnologías, ha podido situarse en cabeza de Europa en el nivel de uso por parte de la ciudadanía de Internet para la interacción con el gobierno. No sólo los ciudadanos y ciudadanas resuelven diariamente todos sus trámites a través de Internet, sino que han puesto en marcha plataformas como Rahvakogu, donde después de los escándalos políticos de 2012, 50.000 personas (de un total de 1.3 millones) participaron proponiendo medidas para mejorar la situación democrática del país.

    diff --git a/app/views/pages/privacy.html.erb b/app/views/pages/privacy.html.erb index d78961d88..3ecbc0a4b 100644 --- a/app/views/pages/privacy.html.erb +++ b/app/views/pages/privacy.html.erb @@ -7,13 +7,13 @@

    AVISO DE PROTECCIÓN DE DATOS

      -
    1. La navegación por la informacion disponible en el Portal de Gobierno Abierto del Ayuntamiento de Madrid es anónima.
      2. -
    2. Para utilizar los servicios contenidos en el Portal de Gobierno Abierto del Ayuntamiento de Madrid el usuario deberá darse de alta y proporcionar previamente los datos de carácter personal segun la informacion especifica que consta en cada tipo de alta.
      3. -
    3. Los datos aportados serán incorporados y tratados por el Ayuntamiento de Madrid de acuerdo con la descripción del fichero siguiente: +
    4. La navegación por la informacion disponible en el Portal de Gobierno Abierto es anónima.
      5. +
    5. Para utilizar los servicios contenidos en el Portal de Gobierno Abierto el usuario deberá darse de alta y proporcionar previamente los datos de carácter personal segun la informacion especifica que consta en cada tipo de alta.
      6. +
    6. Los datos aportados serán incorporados y tratados por el Ayuntamiento de acuerdo con la descripción del fichero siguiente:
        -
      • Nombre del fichero/tratamiento: GESTIÓN DE PROCESOS PARTICIPATIVOS
        • +
      • Nombre del fichero/tratamiento: NOMBRE DEL FICHERO
      • Finalidad del fichero/tratamiento: Gestionar los procesos participativos para el control de la habilitación de las personas que participan en los mismos y recuento meramente numérico y estadístico de los resultados derivados de los procesos de participación ciudadana
        • -
      • Órgano responsable: DIRECCIÓN GENERAL DE PARTICIPACIÓN CIUDADANA (c/ Alcalá 45, 28014-Madrid)
        • +
      • Órgano responsable: ÓRGANO RESPONSABLE
    7. El interesado podrá ejercer los derechos de acceso, rectificación, cancelación y oposición, ante el órgano responsable indicado todo lo cual se informa en el cumplimiento del artículo 5 de la Ley Orgánica 15/1999, de 13 de diciembre, de Protección de Datos de Carácter Personal.
      8. diff --git a/app/views/pages/proposals_info.html.erb b/app/views/pages/proposals_info.html.erb index ffe0eec32..09bf8585e 100644 --- a/app/views/pages/proposals_info.html.erb +++ b/app/views/pages/proposals_info.html.erb @@ -3,9 +3,7 @@ <%= render "shared/back_link" %>
    @@ -14,88 +12,17 @@

    El mecanismo de propuestas ciudadanas se resume en cuatro pasos muy sencillos:

    1. ¡Propones! Creas una propuesta en esta web.
      2. -
    2. ¡Apoyas! La gente hace click en el botón de apoyar tu propuesta (necesitas el apoyo del 2% de los empadronados mayores de 16 años para pasar a la siguiente fase).
      3. -
    3. ¡Decides! Si has conseguido suficientes apoyos, dejamos 45 días para que la gente pueda debatir sobre la propuesta, y después durante una semana se invita a toda la gente de Madrid a decidir si están a favor o en contra de tu propuesta, en esta misma web.
      4. -
    4. ¡Se hace! Si hay más gente a favor de tu propuesta que en contra, el gobierno del Ayuntamiento de Madrid asumirá como propia la propuesta y la llevará a cabo.
      5. +
    5. ¡Apoyas! La gente hace clic en el botón de apoyar tu propuesta (necesitas el apoyo del 2% de los empadronados mayores de 16 años para pasar a la siguiente fase).
      6. +
    6. ¡Decides! Si has conseguido suficientes apoyos, dejamos 45 días para que la gente pueda debatir sobre la propuesta, y después durante una semana se invita a toda la gente empadronada a decidir si están a favor o en contra de tu propuesta, en esta misma web.
      7. +
    7. ¡Se hace! Si hay más gente a favor de tu propuesta que en contra, el gobierno del Ayuntamiento asumirá como propia la propuesta y la llevará a cabo.
    -

    Además no hace falta ni que tengas Internet, todos los pasos se pueden hacer en cualquiera de las 26 Oficinas de Atención al Ciudadano que hay por todo Madrid.

    - -
    - -
    -

    Explicación detallada del proceso

      -
    1. Creación de una propuesta. Cualquier persona (sin necesidad siquiera de estar empadronada en Madrid) puede crear una propuesta. Lo único que hay que hacer es pulsar el botón “Crear una propuesta” y rellenar los campos requeridos. La propuesta puede ser tan sencilla como una simple frase, pero te recomendamos detallarla todo lo posible, incluso añadiendo material adicional, para que sea más completa e interesante. Una vez creada aparecerá en esta web para que cualquiera pueda apoyarla.
      2. -
    2. Apoyo de propuestas. Para apoyar una de las propuestas que aparece en la web, pulsamos el botón “apoyar esta propuesta” que aparece en cada una. Para este paso tendremos que estar empadronados en Madrid, así que al llevarlo a cabo por primera vez se nos pedirá que verifiquemos nuestra cuenta para estar seguros de este requerimiento. Se nos va a pedir que introduzcamos algunos datos para comprobar nuestra información de empadronamiento, y se nos enviará un código personal para que el proceso sea seguro. Las propuestas necesitan una cierta cantidad de apoyos para pasar a la siguiente fase; concretamente el 2% de los empadronados mayores de 16 años (que suponen 53.726 apoyos).
      3. -
    3. Decisión sobre propuestas. Cuando una propuesta consigue los apoyos necesarios, se anuncia en la web. Desde ese momento se dejan 45 días para que todo el mundo pueda debatir e informarse sobre la propuesta. Todas las otras propuestas que hayan conseguido los apoyos necesarios en los primeros 30 días del tiempo de debate se agruparán junto a la primera para decidir sobre ellas al mismo tiempo. Pasados los 45 días se exponen estas propuestas en un espacio especial de votación de la web, donde durante una semana cualquier persona empadronada en Madrid y mayor de 16 años podrá decidir si está a favor o rechaza la propuesta. Para participar en este paso tendrás que tener tu cuenta de usuario verificada completamente, de tal forma que nos aseguremos que cada persona no tiene más de una cuenta y el proceso es seguro.
      4. -
    4. Realización de las propuestas. En caso de que haya más gente a favor de una propuesta que rechazándola se aceptará como propuesta colectiva de la ciudadanía de Madrid, y el gobierno del Ayuntamiento de Madrid la asumirá como propia y la llevará a cabo. Para ello en un plazo máximo de un mes, se realizarán los informes técnicos correspondientes sobre su legalidad, viabilidad y coste económico, teniendo en cuenta a los sectores afectados y a la persona que haya lanzado la propuesta, para detallar la actuación correspondiente por parte del Ayuntamiento. Se publicarán en la web todos los informes realizados, y un seguimiento de las actuaciones que se lleven a cabo, para asegurar un correcto desarrollo de la propuesta.
      5. +
    5. Creación de una propuesta. Cualquier persona (sin necesidad siquiera de estar empadronada) puede crear una propuesta. Lo único que hay que hacer es pulsar el botón “Crear una propuesta” y rellenar los campos requeridos. La propuesta puede ser tan sencilla como una simple frase, pero te recomendamos detallarla todo lo posible, incluso añadiendo material adicional, para que sea más completa e interesante. Una vez creada aparecerá en esta web para que cualquiera pueda apoyarla.
      6. +
    6. Apoyo de propuestas. Para apoyar una de las propuestas que aparece en la web, pulsamos el botón “apoyar esta propuesta” que aparece en cada una. Para este paso tendremos que estar empadronados, así que al llevarlo a cabo por primera vez se nos pedirá que verifiquemos nuestra cuenta para estar seguros de este requerimiento. Se nos va a pedir que introduzcamos algunos datos para comprobar nuestra información de empadronamiento, y se nos enviará un código personal para que el proceso sea seguro. Las propuestas necesitan una cierta cantidad de apoyos para pasar a la siguiente fase; concretamente el 2% de los empadronados mayores de 16 años.
      7. +
    7. Decisión sobre propuestas. Cuando una propuesta consigue los apoyos necesarios, se anuncia en la web. Desde ese momento se dejan 45 días para que todo el mundo pueda debatir e informarse sobre la propuesta. Todas las otras propuestas que hayan conseguido los apoyos necesarios en los primeros 30 días del tiempo de debate se agruparán junto a la primera para decidir sobre ellas al mismo tiempo. Pasados los 45 días se exponen estas propuestas en un espacio especial de votación de la web, donde durante una semana cualquier persona empadronada y mayor de 16 años podrá decidir si está a favor o rechaza la propuesta. Para participar en este paso tendrás que tener tu cuenta de usuario verificada completamente, de tal forma que nos aseguremos que cada persona no tiene más de una cuenta y el proceso es seguro.
      8. +
    8. Realización de las propuestas. En caso de que haya más gente a favor de una propuesta que rechazándola se aceptará como propuesta colectiva de la ciudadanía, y el gobierno del Ayuntamiento la asumirá como propia y la llevará a cabo. Para ello en un plazo máximo de un mes, se realizarán los informes técnicos correspondientes sobre su legalidad, viabilidad y coste económico, teniendo en cuenta a los sectores afectados y a la persona que haya lanzado la propuesta, para detallar la actuación correspondiente por parte del Ayuntamiento. Se publicarán en la web todos los informes realizados, y un seguimiento de las actuaciones que se lleven a cabo, para asegurar un correcto desarrollo de la propuesta.
    - -

    Todas las acciones relacionadas con el proceso de propuestas ciudadanas pueden realizarse a través del portal de gobierno abierto, o presencialmente en cualquiera de las 26 Oficinas de Atención al Ciudadano existentes en Madrid.

    - -

    El proceso de recogida de apoyos de una propuesta puede realizarse también a través de hojas de firmas, cuyo modelo puede ser descargado en este documento PDF. Los apoyos recogidos de esta manera se sumarán a los apoyos ya existentes en el portal de gobierno abierto. Las hojas pueden ser entregadas en cualquiera de los Registros del Ayuntamiento, presentes en cada una de las Juntas de Distrito. Ver la lista completa de Oficinas de Registro.

    - -

    Las directrices aprobadas por el Ayuntamiento por las que se regulan las propuestas ciudadanas son las siguientes: Directrices sobre el derecho de propuesta (documento PDF).

    - -

    Preguntas Frecuentes

    -
      -
    1. ¿Cuáles son los requisitos que se solicitan para poder apoyar o votar propuestas?
      - Estar empadronado en Madrid y ser mayor de 16 años. En caso de que se haga a través de Internet se requerirá que se haya verificado la cuenta de usuario de la web (encontramos el botón de verificación en el apartado “Mi cuenta” en la esquina superior derecha), proporcionando la información del padrón, y un medio de comunicación para obtener un código seguro de participación que introduciremos en la web para validar nuestra cuenta. -
      2. - -
    2. ¿Cómo va a controlarse que cada persona vote una única vez por propuesta?
      - Las votaciones presenciales en las Oficinas de Atención al Ciudadano están controladas porque la persona tiene que presentar su DNI. Para la votación a través de Internet se verifica que la cuenta de usuario corresponde a un único ciudadano/a. Para ello se le facilita un código personal seguro de verificación de la cuenta que se comunica a través de canales de comunicación privados, como son teléfonos móviles que constan en el Ayuntamiento que pertenecen a la persona adecuada, o por correo a través del buzón que figura en la dirección de empadronamiento. De esta forma nos aseguramos de que sólo esa persona ha recibido el código. En caso de que dichos medios de comunicación no estén disponibles se solicitará a la persona que acuda presencialmente a alguna de las Oficinas de Atención al Ciudadano, para obtener su código. -
      3. - -
    3. ¿Se llevará a cabo cualquier propuesta que se acepte por mayoría en la web? ¿incluso aunque sean ilegales o atenten contra los derechos humanos? ¿y si no hay presupuesto para llevarla a cabo?
      - Se establecen una serie de criterios objetivos por los que una propuesta no podrá ser aceptada como, por ejemplo, que tenga fines delictivos o que atente contra derechos fundamentales y libertades públicas. Además se excluyen del proceso las propuestas sobre otras modalidades de participación tales como presupuestos participativos, procesos revocatorios, audiencia pública o iniciativas normativas populares. -
      Este mecanismo de participación no cambia los límites ya existentes para el Ayuntamiento, lo que hace es trasladar quién toma la decisión de lo que haya que hacer, incluyendo a toda la ciudadanía en el proceso de toma de decisiones. -
      En el caso de las propuestas que quedan fuera de las competencias municipales el Ayuntamiento no podrá llevarlas a cabo, pero emprenderá actuaciones alternativas dentro de sus capacidades que intenten cumplir con la decisión de la propuesta. Lo mismo sucede con el presupuesto para llevar a cabo la propuesta; el ayuntamiento utilizará los recursos necesarios en cuanto sea posible, de la misma manera que se costean las decisiones adoptadas sin participación ciudadana. -
      También puede ocurrir que la actuación requiera la aprobación del Pleno, por lo que el resultado dependerá del posicionamiento de todas las fuerzas políticas respecto a la actuación presentada.
      4. - -
    4. ¿Qué diferencia existe entre los debates y las propuestas?
      - Aunque ambos pueden ser apoyados, los primeros no activan ningún mecanismo de actuación concreto, mientras que las segundas pasan a una fase de decisión colectiva y en caso de que sean aprobadas, son asumidas por el Ayuntamiento.
      5. - -
    5. ¿Vota toda la gente de Madrid en cada propuesta? ¿incluso aunque haga referencia a un único distrito?
      - Sí. El mecanismo actual se desarrolla a nivel de toda la ciudad. Lo que no entra en colisión con que a nivel distrital se puedan desarrollar mecanismos de participación ciudadana que afecten únicamente a cada distrito.
      6. - -
    6. ¿Y si se presentan varias propuestas iguales? ¿Se plantea la posibilidad de unificarlas para evitar que se diversifiquen los apoyos y/o votos?
      - Propuestas similares pueden ser marcadas como tales en la plataforma, lo que se señala al visualizar cada una de ellas. Más allá de eso no se unifican, dejando que sea la gente la que decida si apoyar a una o a otra.
      7. - -
    7. ¿Durante cuanto tiempo se pueden recoger apoyos?
      - Las propuestas pueden recoger apoyos durante 12 meses. Si en ese tiempo no consiguen alcanzar el 2% de los apoyos necesarios dejan de poder recibir más apoyos.
      8. - -
    8. ¿Durante cuanto tiempo se votará cada propuesta?
      - Una vez que las propuestas reciben el apoyo del 2% pasan a la fase de decisión final donde la gente puede votar aceptando o rechazando la propuesta durante un plazo de una semana.
      9. - -
    9. ¿Pueden participar asociaciones, fundaciones y ONG´s? ¿Y empresas?
      - Las propuestas tienen que ser presentadas individualmente, sin problema de que la persona que la presenta represente a una organización de cualquier tipo. Al registrar una propuesta en la web existe la posibilidad de señalar este caso como registro de asociaciones/colectivos.
      10. - -
    10. ¿Cuánta gente tiene que votar una propuesta para que sea aprobada? ¿Qué quórum mínimo se necesita para que las votaciones sean vinculantes?
      - El quórum es el mínimo de participación necesaria para considerar una votación vinculante de manera legal. Ningún reglamento del Ayuntamiento puede hacer que este mecanismo sea vinculante juridicamente, porque eso está en contra de la legislación española. La vinculación con el mecanismo es política y se asume de manera personal por los concejales y la Alcaldesa. Por ello no se considerará ningún quórum.
      11. - -
    11. ¿Existen mecanismos presenciales para participar? ¿Se ha planteado llegar a los ciudadanos y ciudadanas con dificultades de acceso a Internet o en situación de exclusión?
      - Todas las acciones relacionadas con el proceso de propuestas ciudadanas pueden realizarse presencialmente en cualquiera de las 26 Oficinas de Atención al Ciudadano repartidas por todos los distritos de Madrid. Además, el proceso de recogida de apoyos de una propuesta puede realizarse también a través de hojas de firmas, cuyo modelo puede ser descargado en este documento PDF. -
      Adicionalmente se ha creado en el Área de Gobierno de Participación Ciudadana, Transparencia y Gobierno Abierto el Servicio de Inclusión, Neutralidad y Privacidad que pondrá en marcha una mesa de inclusión con personal del Ayuntamiento y asociaciones que trabajan con colectivos en situación de exclusión, para diseñar mecanismos especiales para que puedan participar dichos colectivos.
      12. - -
    12. ¿Cómo puede participar la gente que no esté empadronada en Madrid?
      - Presentando propuestas, participando en los debates, y difundiendo lo que ocurra en la plataforma.
      13. - -
    13. ¿El voto es secreto? ¿el Ayuntamiento podrá tener acceso a los votos de los ciudadanos?
      - El voto es totalmente secreto. Se encripta de manera conjunta con diferentes autoridades externas al Ayuntamiento, de tal manera que para poder conocer la identidad de un votante todas las autoridades tendrían que realizar fraude conjuntamente.
      14. - -
    14. ¿Al ser electrónico el voto no se aumenta el riesgo de fraude? - No, incluso lo reducimos. Hay una sensación subjetiva muy fuerte de diferencia de seguridad entre procesos en papel y procesos electrónicos que no se corresponde con la realidad. En las elecciones generales donde el voto es en papel, después de que las mesas hayan hecho el recuento, las papeletas de los votos se tiran a la basura, y la persona responsable se dirige en persona con el recuento en la mano al centro donde se comparten los datos. Y sin embargo pensemos por ejemplo en el sistema de tarjetas de crédito y cuentas bancarias, donde cada día confiamos la seguridad de nuestro dinero a un sistema electrónico. En el caso del Ayuntamiento, la votación está asegurada mediante diferentes entidades externas, y además cualquier votante puede tanto comprobar que su voto particular está en el recuento final, como realizar el recuento completo de todos los votos por su cuenta. Dos garantías de seguridad completamente imposibles en un votación tradicional.
      15. - -
    15. ¿Cómo se sabe que una propuesta se ha cumplido?
      - Cuando se aprueba una propuesta, el Ayuntamiento publica en la página web cuáles son los pasos que se van a realizar para ponerla en práctica, incluyendo los informes que las correspondientes áreas redacten y las acciones que se emprenden. La información es completa y transparente para que puedas hacer un seguimiento de cómo evoluciona cada propuesta ciudadana.
      16. -
    - -

    Hojas de firmas para recoger apoyos

    -

    El proceso de recogida de apoyos de una propuesta, además de en la web, puede realizarse a través de hojas de firmas, cuyo modelo puede ser descargado en este documento PDF.

    -

    La hoja debe contener en las casillas superiores el código de la propuesta y su título, según figura en la página web específica de la propuesta, dentro del Portal de Gobierno Abierto.

    -

    Los apoyos recogidos de esta manera se sumarán a los apoyos ya existentes en el portal de gobierno abierto. Las hojas pueden ser entregadas en cualquiera de los Registros del Ayuntamiento, presentes en cada una de las Juntas de Distrito. Ver la lista completa de Oficinas de Registro.

    diff --git a/public/maintenance.html b/public/maintenance.html index 059c93782..ebbe5fe28 100644 --- a/public/maintenance.html +++ b/public/maintenance.html @@ -68,7 +68,7 @@
    -

    MadridDecide

    +

    Consul

    Página en mantenimiento

    Por favor, inténtalo de nuevo en unos minutos.

    From 42722080fca946d37c73360a5f247905ef825aac Mon Sep 17 00:00:00 2001 From: Alberto Garcia Cabeza Date: Tue, 5 Jul 2016 13:47:14 +0200 Subject: [PATCH 096/126] Changes references to Madrid --- app/mailers/application_mailer.rb | 2 +- .../document_verifications/invalid_document.html.erb | 2 +- app/views/shared/_social_media_meta_tags.html.erb | 2 +- app/views/verification/residence/_errors.html.erb | 2 +- config/deploy-secrets.yml.example | 6 +++--- config/initializers/devise.rb | 2 +- config/locales/mailers.en.yml | 2 +- config/locales/mailers.es.yml | 2 +- config/locales/management.es.yml | 2 +- config/locales/pages.en.yml | 4 +--- config/locales/pages.es.yml | 6 ++---- config/routes.rb | 2 +- lib/sms_api.rb | 2 +- 13 files changed, 16 insertions(+), 20 deletions(-) diff --git a/app/mailers/application_mailer.rb b/app/mailers/application_mailer.rb index 8838f522f..1dbc5baa2 100644 --- a/app/mailers/application_mailer.rb +++ b/app/mailers/application_mailer.rb @@ -1,5 +1,5 @@ class ApplicationMailer < ActionMailer::Base helper :settings - default from: "Decide Madrid " + default from: "Consul " layout 'mailer' end diff --git a/app/views/management/document_verifications/invalid_document.html.erb b/app/views/management/document_verifications/invalid_document.html.erb index 58ddb221e..d2b2f22c1 100644 --- a/app/views/management/document_verifications/invalid_document.html.erb +++ b/app/views/management/document_verifications/invalid_document.html.erb @@ -12,6 +12,6 @@

    <%= t("management.document_verifications.has_no_account_html", - link: link_to('http://decide.madrid.es', 'http://decide.madrid.es'), + link: link_to(t('management.document_verifications.link'), root_path)).html_safe, target: "_blank") %>

    diff --git a/app/views/shared/_social_media_meta_tags.html.erb b/app/views/shared/_social_media_meta_tags.html.erb index 5a2efbd04..50a2efec9 100644 --- a/app/views/shared/_social_media_meta_tags.html.erb +++ b/app/views/shared/_social_media_meta_tags.html.erb @@ -1,6 +1,6 @@ - + diff --git a/app/views/verification/residence/_errors.html.erb b/app/views/verification/residence/_errors.html.erb index c19640a3d..dd4112d7c 100644 --- a/app/views/verification/residence/_errors.html.erb +++ b/app/views/verification/residence/_errors.html.erb @@ -6,7 +6,7 @@ <%= t("verification.residence.new.error_verifying_census", offices: link_to( t("verification.residence.new.error_verifying_census_offices"), - "http://www.madrid.es/portales/munimadrid/es/Inicio/El-Ayuntamiento/Atencion-al-ciudadano/Oficinas-de-Atencion-al-Ciudadano?vgnextfmt=default&vgnextchannel=5b99cde2e09a4310VgnVCM1000000b205a0aRCRD", title: t('shared.target_blank_html'), target: "_blank")).html_safe %> + t("verification.residence.new.error_verifying_census_offices_url"), title: t('shared.target_blank_html'), target: "_blank")).html_safe %>
    <% else %> diff --git a/config/deploy-secrets.yml.example b/config/deploy-secrets.yml.example index 15869cf51..671263b1c 100644 --- a/config/deploy-secrets.yml.example +++ b/config/deploy-secrets.yml.example @@ -1,11 +1,11 @@ staging: deploy_to: "/var/www/consul" ssh_port: 21 - server: staging.consul.madrid.es + server: staging.consul.es user: xxxxx full_app_name: consul - server_name: staging.consul.madrid.es - db_server: postgre.consul.madrid.es + server_name: staging.consul.es + db_server: postgre.consul.es preproduction: deploy_to: "/var/www/consul" diff --git a/config/initializers/devise.rb b/config/initializers/devise.rb index 2780e30b6..edabf24d4 100644 --- a/config/initializers/devise.rb +++ b/config/initializers/devise.rb @@ -12,7 +12,7 @@ Devise.setup do |config| # Configure the e-mail address which will be shown in Devise::Mailer, # note that it will be overwritten if you use your own mailer class # with default "from" parameter. - config.mailer_sender = 'noreply@madrid.es' + config.mailer_sender = 'noreply@consul.es' # Configure the class responsible to send e-mails. config.mailer = 'DeviseMailer' diff --git a/config/locales/mailers.en.yml b/config/locales/mailers.en.yml index f4cdaf563..3fa63f9ec 100755 --- a/config/locales/mailers.en.yml +++ b/config/locales/mailers.en.yml @@ -25,7 +25,7 @@ en: hi: "Dear user," new_html: "For all these, we invite you to elaborate a new proposal that ajusts to the conditions of this process. You can do it following this link: %{url}." new_href: "new investment project" - reconsider_html: "If you believe that the rejected proposal meets the requirements to be an investment proposal, you can communicate this, within 48 hours, responding to the email address preparticipativos@madrid.es. Including the code %{code} in the subject of the email." + reconsider_html: "If you believe that the rejected proposal meets the requirements to be an investment proposal, you can communicate this, within 48 hours, responding to the email address examples@consul.es. Including the code %{code} in the subject of the email." sincerely: "Sincerely" signatory: "DEPARTMENT OF PUBLIC PARTICIPATION" sorry: "Sorry for the inconvenience and we again thank you for your invaluable participation." diff --git a/config/locales/mailers.es.yml b/config/locales/mailers.es.yml index ec6d50dcc..49e3e0796 100644 --- a/config/locales/mailers.es.yml +++ b/config/locales/mailers.es.yml @@ -25,7 +25,7 @@ es: hi: "Estimado usuario," new_html: "Por todo ello, te invitamos a que elabores una nueva propuesta que se ajuste a las condiciones de este proceso. Esto lo puedes hacer en este enlace: %{url}." new_href: "nueva propuesta de inversión" - reconsider_html: "Si consideras que la propuesta rechazada cumple los requisitos para mantenerla como propuesta de inversión, podrás comunicarlo, en el plazo de 48 horas, al correo preparticipativos@madrid.es, indicando necesariamente para su tramitación el código %{code} como asunto del correo, correspondiente a tu propuesta." + reconsider_html: "Si consideras que la propuesta rechazada cumple los requisitos para mantenerla como propuesta de inversión, podrás comunicarlo, en el plazo de 48 horas, al correo example@consul.es, indicando necesariamente para su tramitación el código %{code} como asunto del correo, correspondiente a tu propuesta." sincerely: "Atentamente" signatory: "DIRECCIÓN GENERAL DE PARTICIPACIÓN CIUDADANA" sorry: "Sentimos las molestias ocasionadas y volvemos a darte las gracias por tu inestimable participación." diff --git a/config/locales/management.es.yml b/config/locales/management.es.yml index 4b2e9061a..e9c39d406 100644 --- a/config/locales/management.es.yml +++ b/config/locales/management.es.yml @@ -26,7 +26,7 @@ es: link: Consul in_census_has_following_permissions: 'Este usuario puede participar en el Portal de Gobierno Abierto con las siguientes posibilidades:' not_in_census: Este documento no está registrado. - not_in_census_info: 'Las personas no empadronadas en Madrid pueden participar en el Portal de Gobierno Abierto del Ayuntamiento de Madrid con las siguientes posibilidades:' + not_in_census_info: 'Las personas no empadronadas pueden participar en el Portal de Gobierno Abierto con las siguientes posibilidades:' please_check_account_data: Compruebe que los datos anteriores son correctos para proceder a verificar la cuenta completamente. title: Gestión de usuarios under_age: Debes ser mayor de 16 años para verificar tu cuenta. diff --git a/config/locales/pages.en.yml b/config/locales/pages.en.yml index bb2a12a0d..2374e3d4b 100755 --- a/config/locales/pages.en.yml +++ b/config/locales/pages.en.yml @@ -46,9 +46,7 @@ en: This Open Government Portal use the [Consul app](https://github.com/ayuntamientomadrid 'consul github') that is free software, with [licence AGPLv3](http://www.gnu.org/licenses/agpl-3.0.html 'AGPLv3 gnu' ), that means in simple words that anyone can use the code freely, copy it, see it in detail, modify it and redistribute it to the word with the modifications he wants (allowing others to do the same). Because we think culture is better and richer when it is released. - Not only can you use freely this portal in yout local government, but you also will be helped by Madrid city council as much as possible to do it, so if you are interested write us: ag.gobiernoabierto@madrid.es - - If you are a programmer, you can see the code and help us to improve it at [Consul app](https://github.com/ayuntamientomadrid 'consul github ' ). + If you are a programmer, you can see the code and help us to improve it at [Consul app](https://github.com/ayuntamientomadrid 'consul github'). titles: faq: Solution to tecnical problemas (FAQ) how_it_works: How does this Open Government Portal work? diff --git a/config/locales/pages.es.yml b/config/locales/pages.es.yml index 733b064b3..c9f282a4f 100644 --- a/config/locales/pages.es.yml +++ b/config/locales/pages.es.yml @@ -44,11 +44,9 @@ es: text: |- Utilízalo en tu municipio libremente o ayúdanos a mejorarlo, es software libre. - Este Portal de Gobierno Abierto usa la [aplicación Consul](https://github.com/ayuntamientomadrid 'github consul' ) que es software libre, con [licencia AGPLv3](http://www.gnu.org/licenses/agpl-3.0.html 'AGPLv3 gnu' ), esto significa en palabras sencillas, que cualquiera puede libremente usar el código, copiarlo, verlo en detalle, modificarlo, y redistribuirlo al mundo con las modificaciones que quiera (manteniendo el que otros puedan a su vez hacer lo mismo). Porque creemos que la cultura es mejor y más rica cuando se libera. + Este Portal de Gobierno Abierto usa la [aplicación Consul](https://github.com/ayuntamientomadrid 'github consul') que es software libre, con [licencia AGPLv3](http://www.gnu.org/licenses/agpl-3.0.html 'AGPLv3 gnu' ), esto significa en palabras sencillas, que cualquiera puede libremente usar el código, copiarlo, verlo en detalle, modificarlo, y redistribuirlo al mundo con las modificaciones que quiera (manteniendo el que otros puedan a su vez hacer lo mismo). Porque creemos que la cultura es mejor y más rica cuando se libera. - No sólo puedes utilizar libremente este portal en tu municipio, sino que desde el Ayuntamiento de Madrid vamos a ayudarte todo lo posible a que lo hagas, así que si estás interesado, escríbenos a ag.gobiernoabierto@madrid.es - - Si eres programador, puedes ver el código y ayudarnos a mejorarlo en [aplicación Consul](https://github.com/ayuntamientomadrid 'github consul' ). + Si eres programador, puedes ver el código y ayudarnos a mejorarlo en [aplicación Consul](https://github.com/ayuntamientomadrid 'github consul'). titles: faq: Soluciones a problemas técnicos (FAQ) how_it_works: "¿Cómo funciona este Portal de Gobierno Abierto?" diff --git a/config/routes.rb b/config/routes.rb index 37497268c..658a9b027 100644 --- a/config/routes.rb +++ b/config/routes.rb @@ -267,6 +267,6 @@ Rails.application.routes.draw do mount Tolk::Engine => '/translate', :as => 'tolk' # static pages - get '/blog' => redirect("http://diario.madrid.es/participa/") + get '/blog' => redirect("http://hereyourblogsite.com/") resources :pages, path: '/', only: [:show] end diff --git a/lib/sms_api.rb b/lib/sms_api.rb index e3a7c6ff2..de0e2c312 100644 --- a/lib/sms_api.rb +++ b/lib/sms_api.rb @@ -25,7 +25,7 @@ class SMSApi def request(phone, code) { autorizacion: authorization, destinatarios: { destinatario: phone }, - texto_mensaje: "Clave para verificarte: #{code}. Gobierno Abierto - Ayuntamiento de Madrid", + texto_mensaje: "Clave para verificarte: #{code}. Gobierno Abierto", solicita_notificacion: "All" } end From d24efbad60e9b9a41849f4de61848f3d72c4a4a5 Mon Sep 17 00:00:00 2001 From: Alberto Garcia Cabeza Date: Wed, 6 Jul 2016 12:32:07 +0200 Subject: [PATCH 097/126] Changes .com urls examples to .consul --- config/environments/test.rb | 2 +- config/locales/en.yml | 4 ++-- config/locales/es.yml | 4 ++-- config/locales/management.en.yml | 4 ++-- config/locales/management.es.yml | 4 ++-- config/locales/verification.en.yml | 5 +++-- config/locales/verification.es.yml | 5 +++-- config/routes.rb | 2 +- doc/locales/fr.yaml | 8 ++++---- doc/locales/pt-br.yaml | 8 ++++---- 10 files changed, 24 insertions(+), 22 deletions(-) diff --git a/config/environments/test.rb b/config/environments/test.rb index 4912a6cc2..29682e8e1 100644 --- a/config/environments/test.rb +++ b/config/environments/test.rb @@ -38,7 +38,7 @@ Rails.application.configure do config.action_mailer.default_url_options = { host: 'test' } - config.action_mailer.asset_host = 'http://madrid.test' + config.action_mailer.asset_host = 'http://consul.test' # Randomize the order test cases are executed. config.active_support.test_order = :random diff --git a/config/locales/en.yml b/config/locales/en.yml index adc9b275a..05153d714 100755 --- a/config/locales/en.yml +++ b/config/locales/en.yml @@ -182,14 +182,14 @@ en: privacy: Privacy Policy transparency_text: Find out anything about the city. transparency_title: Transparency - transparency_url: https://yourtransparencysite.com + transparency_url: https://transparency.consul header: administration: Administration debates: Debates external_link_blog: Blog external_link_opendata: Open data external_link_transparency: Transparency - external_link_transparency_url: https://yourtransparencysite.com + external_link_transparency_url: https://transparency.consul locale: 'Language:' logo: Consul management: Management diff --git a/config/locales/es.yml b/config/locales/es.yml index 9a586e96a..9391da3bf 100755 --- a/config/locales/es.yml +++ b/config/locales/es.yml @@ -182,14 +182,14 @@ es: privacy: Política de privacidad transparency_text: Obtén cualquier información sobre la ciudad. transparency_title: Transparencia - transparency_url: https://yourtransparencysite.com + transparency_url: https://transparency.consul header: administration: Administrar debates: Debates external_link_blog: Blog external_link_opendata: Datos abiertos external_link_transparency: Transparencia - external_link_transparency_url: https://yourtransparencysite.com + external_link_transparency_url: https://transparency.consul locale: 'Idioma:' logo: Consul management: Gestión diff --git a/config/locales/management.en.yml b/config/locales/management.en.yml index 8833eac0f..fa02e5bc3 100644 --- a/config/locales/management.en.yml +++ b/config/locales/management.en.yml @@ -59,10 +59,10 @@ en: support_proposals: Support proposals vote_proposals: Vote proposals print: - proposals_info: Create yor proposal on http://hereyoursite.com + proposals_info: Create yor proposal on http://url.consul proposals_note: The proposals more supported will be voted. If are accepted by a majority, the city Council shall be carried out. proposals_title: 'Proposals:' - spending_proposals_info: Participate at http://hereyoursite.com + spending_proposals_info: Participate at http://url.consul spending_proposals_note: Participatory budget will be assigned to the most votes spending proposals. print_info: Print this info proposals: diff --git a/config/locales/management.es.yml b/config/locales/management.es.yml index e9c39d406..fe3d08697 100644 --- a/config/locales/management.es.yml +++ b/config/locales/management.es.yml @@ -59,10 +59,10 @@ es: support_proposals: Apoyar propuestas vote_proposals: Participar en las votaciones finales print: - proposals_info: Haz tu propuesta en http://hereyoursite.com + proposals_info: Haz tu propuesta en http://url.consul proposals_note: Las propuestas más apoyadas serán llevadas a votación. Y si las acepta una mayoría, el Ayuntamiento las llevará a cabo. proposals_title: 'Propuestas:' - spending_proposals_info: Participa en http://hereyoursite.com + spending_proposals_info: Participa en http://url.consul spending_proposals_note: Los presupuestos participativos se invertirán en las propuestas de inversión más apoyadas. print_info: Imprimir esta información proposals: diff --git a/config/locales/verification.en.yml b/config/locales/verification.en.yml index 6474ac20d..e47e5a6b3 100755 --- a/config/locales/verification.en.yml +++ b/config/locales/verification.en.yml @@ -21,7 +21,7 @@ en: create: flash: offices: Citizen Support Offices - offices_url: http://yourcitizensupportofficesite.com + offices_url: http://offices.consul success_html: Thank you for requesting your maximum security code (only required for the final votes). In a few days we will send it to the address featuring in the data we have on file. Please remember that, if you prefer, you can collect your code from any of the %{offices}. edit: see_all: See proposals @@ -33,7 +33,7 @@ en: go_to_index: See proposals office: Verify in any %{office} offices: Citizen Support Offices - offices_url: http://yourcitizensupportofficesite.com + offices_url: http://offices.consul send_letter: Send me a letter with the code title: Congratulations! user_permission_info: With your account you can... @@ -65,6 +65,7 @@ en: error_not_allowed_postal_code: In order to be verified, you must be registered. error_verifying_census: The Census was unable to verify your information. Please confirm that your census details are correct by calling to City Council or visit one %{offices}. error_verifying_census_offices: Citizen Support Office + error_verifying_census_offices_url: http://offices.consul form_errors: prevented the verification of your residence postal_code: Postcode postal_code_note: To verify your account you must be registered diff --git a/config/locales/verification.es.yml b/config/locales/verification.es.yml index e6d0ffa0d..a8e41ea09 100644 --- a/config/locales/verification.es.yml +++ b/config/locales/verification.es.yml @@ -21,7 +21,7 @@ es: create: flash: offices: Oficinas de Atención al Ciudadano - offices_url: http://yourcitizensupportofficesite.com + offices_url: http://offices.consul success_html: Antes de las votaciones recibirás una carta con las instrucciones para verificar tu cuenta.
    Recuerda que puedes ahorrar el envío verificándote presencialmente en cualquiera de las %{offices}. edit: see_all: Ver propuestas @@ -33,7 +33,7 @@ es: go_to_index: Ver propuestas office: Verificarte presencialmente en cualquier %{office} offices: Oficina de Atención al Ciudadano - offices_url: http://yourcitizensupportofficesite.com + offices_url: http://offices.consul send_letter: Solicitar una carta por correo postal title: "¡Felicidades!" user_permission_info: Con tu cuenta ya puedes... @@ -65,6 +65,7 @@ es: error_not_allowed_postal_code: Para verificarte debes estar empadronado. error_verifying_census: El Padrón no pudo verificar tu información. Por favor, confirma que tus datos de empadronamiento sean correctos llamando al Ayuntamiento o visitando una %{offices}. error_verifying_census_offices: oficina de Atención al ciudadano + error_verifying_census_offices_url: http://offices.consul form_errors: evitaron verificar tu residencia postal_code: Código postal postal_code_note: Para verificar tus datos debes estar empadronado diff --git a/config/routes.rb b/config/routes.rb index 658a9b027..4f3eb94ec 100644 --- a/config/routes.rb +++ b/config/routes.rb @@ -267,6 +267,6 @@ Rails.application.routes.draw do mount Tolk::Engine => '/translate', :as => 'tolk' # static pages - get '/blog' => redirect("http://hereyourblogsite.com/") + get '/blog' => redirect("http://blog.consul/") resources :pages, path: '/', only: [:show] end diff --git a/doc/locales/fr.yaml b/doc/locales/fr.yaml index 3b8e5571c..e3298cb1f 100644 --- a/doc/locales/fr.yaml +++ b/doc/locales/fr.yaml @@ -865,14 +865,14 @@ fr: privacy: Vie privée transparency_text: Trouver tout à propos de la mairie de Madrid transparency_title: Transparence - transparency_url: https://yourtransparencysite.com + transparency_url: https://transparency.consul header: administration: Administration debates: Débats external_link_blog: Blog external_link_opendata: Open data external_link_transparency: Transparence - external_link_transparency_url: https://yourtransparencysite.com + external_link_transparency_url: https://transparency.consul locale: 'Langue :' logo: Consul moderation: Modération @@ -1497,7 +1497,7 @@ fr: create: flash: offices: Bureaux de soutien aux citoyens - offices_url: http://yourcitizensupportofficesite.com + offices_url: http://offices.consul success_html: Merci d'avoir demandé votre code de sécurité maximum (uniquement requis pour le vote final). Dans quelques jours, nous vous enverrons un courrier vers votre adresse postale. Vous pouvez le réclamer dans n'importe @@ -1512,7 +1512,7 @@ fr: go_to_index: Voir les propositions office: Vérifier dans n'importe quel %{office} offices: Bureaux de soutien aux citoyens - offices_url: http://yourcitizensupportofficesite.com + offices_url: http://offices.consul send_letter: Envoyer une lettre avec le code title: Félicitations user_permission_info: Avec votre compte, vous pouvez diff --git a/doc/locales/pt-br.yaml b/doc/locales/pt-br.yaml index 363427030..9098a933e 100644 --- a/doc/locales/pt-br.yaml +++ b/doc/locales/pt-br.yaml @@ -854,14 +854,14 @@ pt-BR: privacy: Política de privacidade transparency_text: Descubra tudo sobre a Câmara da Cidade de Madrid. transparency_title: Transparência - transparency_url: https://yourtransparencysite.com + transparency_url: https://transparency.consul header: administration: Administração debates: Debates external_link_blog: Blog external_link_opendata: Dados abertos external_link_transparency: Transparência - external_link_transparency_url: https://yourtransparencysite.com + external_link_transparency_url: https://transparency.consul locale: 'Idioma:' logo: Consul moderation: Moderação @@ -1515,7 +1515,7 @@ pt-BR: create: flash: offices: Escritórios de Apoio ao Cidadão - offices_url: http://yourcitizensupportofficesite.com + offices_url: http://offices.consul success_html: Obrigado por solicitar seu código de segurança máxima (somente solicitado em votações finais). Em poucos dias nós lhe enviaremos para seu endereço relacionado nos dados que temos em arquivo. Por favor @@ -1531,7 +1531,7 @@ pt-BR: go_to_index: Ver propostas office: Verificar em qualquer %{office} offices: Escritórios de Apoio ao Cidadão - offices_url: http://yourcitizensupportofficesite.com + offices_url: http://offices.consul send_letter: Envie-me uma carta com o código title: Parabéns! user_permission_info: Com a sua conta você pode... From 219f4e2c15d447e35d9fc948eb2975dfbdaa756d Mon Sep 17 00:00:00 2001 From: Alberto Garcia Cabeza Date: Wed, 6 Jul 2016 12:32:14 +0200 Subject: [PATCH 098/126] Deletes sitemap --- public/sitemap.xml | 49 ---------------------------------------------- 1 file changed, 49 deletions(-) delete mode 100644 public/sitemap.xml diff --git a/public/sitemap.xml b/public/sitemap.xml deleted file mode 100644 index 0740af73a..000000000 --- a/public/sitemap.xml +++ /dev/null @@ -1,49 +0,0 @@ - - - - https://decide.madrid.es/ - 0.7 - - - https://decide.madrid.es/proposals - 0.9 - always - - - https://decide.madrid.es/debates - 0.7 - - - https://decide.madrid.es/users/sign_up - - - https://decide.madrid.es/users/sign_in - - - https://decide.madrid.es/more_information - - - https://decide.madrid.es/how_it_works - - - https://decide.madrid.es/how_to_use - - - https://decide.madrid.es/participation - - - https://decide.madrid.es/proposals_info - - - https://decide.madrid.es/participation_world - - - https://decide.madrid.es/participation_facts - - - https://decide.madrid.es/privacy - - - https://decide.madrid.es/conditions - - From edd8883deba401b04528fccb9b6b4cb3ad052217 Mon Sep 17 00:00:00 2001 From: Alberto Garcia Cabeza Date: Wed, 6 Jul 2016 13:43:05 +0200 Subject: [PATCH 099/126] Fixes specs --- .../document_verifications/invalid_document.html.erb | 3 +-- spec/features/admin/banners_spec.rb | 4 ++-- spec/features/comments/debates_spec.rb | 6 +++--- spec/features/comments/proposals_spec.rb | 6 +++--- spec/features/official_positions_spec.rb | 1 + spec/features/verification/letter_spec.rb | 2 +- spec/features/verification/residence_spec.rb | 12 ++++++------ spec/models/residence_spec.rb | 2 +- 8 files changed, 18 insertions(+), 18 deletions(-) diff --git a/app/views/management/document_verifications/invalid_document.html.erb b/app/views/management/document_verifications/invalid_document.html.erb index d2b2f22c1..4e867b8f6 100644 --- a/app/views/management/document_verifications/invalid_document.html.erb +++ b/app/views/management/document_verifications/invalid_document.html.erb @@ -12,6 +12,5 @@

    <%= t("management.document_verifications.has_no_account_html", - link: link_to(t('management.document_verifications.link'), root_path)).html_safe, - target: "_blank") %> + link: link_to(t('management.document_verifications.link'), root_path, target: "_blank")).html_safe %>

    diff --git a/spec/features/admin/banners_spec.rb b/spec/features/admin/banners_spec.rb index 6d7779aa4..8578778ed 100644 --- a/spec/features/admin/banners_spec.rb +++ b/spec/features/admin/banners_spec.rb @@ -85,7 +85,7 @@ feature 'Admin banners magement' do 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' + fill_in 'banner_target_url', with: 'https://www.url.com' last_week = Time.now - 7.days next_week = Time.now + 7.days fill_in 'post_started_at', with: last_week.strftime("%d/%m/%Y") @@ -98,7 +98,7 @@ feature 'Admin banners magement' do 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' + expect(page).to have_link 'Such banner many text wow link', href: 'https://www.url.com' end scenario 'Edit banner with live refresh', :js do diff --git a/spec/features/comments/debates_spec.rb b/spec/features/comments/debates_spec.rb index d80b08bc0..d9e58343a 100644 --- a/spec/features/comments/debates_spec.rb +++ b/spec/features/comments/debates_spec.rb @@ -118,13 +118,13 @@ feature 'Commenting debates' do end scenario 'Sanitizes comment body for security' do - create :comment, commentable: debate, body: " click me http://madrid.es" + create :comment, commentable: debate, body: " click me http://www.url.com" visit debate_path(debate) within first('.comment') do - expect(page).to have_content "click me http://madrid.es" - expect(page).to have_link('http://madrid.es', href: 'http://madrid.es') + expect(page).to have_content "click me http://www.url.com" + expect(page).to have_link('http://www.url.com', href: 'http://www.url.com') expect(page).not_to have_link('click me') end end diff --git a/spec/features/comments/proposals_spec.rb b/spec/features/comments/proposals_spec.rb index 8312176cd..a861615b7 100644 --- a/spec/features/comments/proposals_spec.rb +++ b/spec/features/comments/proposals_spec.rb @@ -118,13 +118,13 @@ feature 'Commenting proposals' do end scenario 'Sanitizes comment body for security' do - create :comment, commentable: proposal, body: " click me http://madrid.es" + create :comment, commentable: proposal, body: " click me http://www.url.com" visit proposal_path(proposal) within first('.comment') do - expect(page).to have_content "click me http://madrid.es" - expect(page).to have_link('http://madrid.es', href: 'http://madrid.es') + expect(page).to have_content "click me http://www.url.com" + expect(page).to have_link('http://www.url.com', href: 'http://www.url.com') expect(page).not_to have_link('click me') end end diff --git a/spec/features/official_positions_spec.rb b/spec/features/official_positions_spec.rb index 01f78370a..ff31c0a27 100644 --- a/spec/features/official_positions_spec.rb +++ b/spec/features/official_positions_spec.rb @@ -55,6 +55,7 @@ feature 'Official positions' do scenario "Index" do visit proposals_path + debugger expect_badge_for("proposal", @proposal1) expect_no_badge_for("proposal", @proposal2) diff --git a/spec/features/verification/letter_spec.rb b/spec/features/verification/letter_spec.rb index 50635a73c..9a9b2500b 100644 --- a/spec/features/verification/letter_spec.rb +++ b/spec/features/verification/letter_spec.rb @@ -26,7 +26,7 @@ feature 'Verify Letter' do login_as(user) visit new_letter_path - expect(page).to have_link "Citizen Support Offices", href: "http://www.madrid.es/portales/munimadrid/es/Inicio/El-Ayuntamiento/Atencion-al-ciudadano/Oficinas-de-Atencion-al-Ciudadano?vgnextfmt=default&vgnextchannel=5b99cde2e09a4310VgnVCM1000000b205a0aRCRD" + expect(page).to have_link "Citizen Support Offices", href: "http://offices.consul" end scenario "Deny access unless verified residence" do diff --git a/spec/features/verification/residence_spec.rb b/spec/features/verification/residence_spec.rb index 1961269da..88d1579a9 100644 --- a/spec/features/verification/residence_spec.rb +++ b/spec/features/verification/residence_spec.rb @@ -4,7 +4,7 @@ feature 'Residence' do background { create(:geozone) } - scenario 'Verify resident in Madrid' do + scenario 'Verify resident' do user = create(:user) login_as(user) @@ -34,7 +34,7 @@ feature 'Residence' do expect(page).to have_content /\d errors? prevented the verification of your residence/ end - scenario 'Error on postal code not in Madrid census' do + scenario 'Error on postal code not in census' do user = create(:user) login_as(user) @@ -51,10 +51,10 @@ feature 'Residence' do click_button 'Verify residence' - expect(page).to have_content 'In order to be verified, you must be registered in the municipality of Madrid' + expect(page).to have_content 'In order to be verified, you must be registered' end - scenario 'Error on Madrid census' do + scenario 'Error on census' do user = create(:user) login_as(user) @@ -71,7 +71,7 @@ feature 'Residence' do click_button 'Verify residence' - expect(page).to have_content 'The Madrid Census was unable to verify your information' + expect(page).to have_content 'The Census was unable to verify your information' end scenario '5 tries allowed' do @@ -91,7 +91,7 @@ feature 'Residence' do check 'residence_terms_of_service' click_button 'Verify residence' - expect(page).to have_content 'The Madrid Census was unable to verify your information' + expect(page).to have_content 'The Census was unable to verify your information' end click_button 'Verify residence' diff --git a/spec/models/residence_spec.rb b/spec/models/residence_spec.rb index ce151eaee..5288a20b5 100644 --- a/spec/models/residence_spec.rb +++ b/spec/models/residence_spec.rb @@ -49,7 +49,7 @@ describe Verification::Residence do residence.postal_code = "13280" residence.valid? expect(residence.errors[:postal_code].size).to eq(1) - expect(residence.errors[:postal_code]).to include("In order to be verified, you must be registered in the municipality of Madrid.") + expect(residence.errors[:postal_code]).to include("In order to be verified, you must be registered.") end end From 702cfe13d11e33b6c612f3f60f88e758b928f6fa Mon Sep 17 00:00:00 2001 From: Alberto Garcia Cabeza Date: Wed, 6 Jul 2016 14:47:09 +0200 Subject: [PATCH 100/126] Fixes specs --- .../document_verifications/invalid_document.html.erb | 3 +-- spec/features/admin/banners_spec.rb | 4 ++-- spec/features/comments/debates_spec.rb | 6 +++--- spec/features/comments/proposals_spec.rb | 6 +++--- spec/features/verification/letter_spec.rb | 2 +- spec/features/verification/residence_spec.rb | 12 ++++++------ spec/models/residence_spec.rb | 2 +- 7 files changed, 17 insertions(+), 18 deletions(-) diff --git a/app/views/management/document_verifications/invalid_document.html.erb b/app/views/management/document_verifications/invalid_document.html.erb index d2b2f22c1..4e867b8f6 100644 --- a/app/views/management/document_verifications/invalid_document.html.erb +++ b/app/views/management/document_verifications/invalid_document.html.erb @@ -12,6 +12,5 @@

    <%= t("management.document_verifications.has_no_account_html", - link: link_to(t('management.document_verifications.link'), root_path)).html_safe, - target: "_blank") %> + link: link_to(t('management.document_verifications.link'), root_path, target: "_blank")).html_safe %>

    diff --git a/spec/features/admin/banners_spec.rb b/spec/features/admin/banners_spec.rb index 6d7779aa4..8578778ed 100644 --- a/spec/features/admin/banners_spec.rb +++ b/spec/features/admin/banners_spec.rb @@ -85,7 +85,7 @@ feature 'Admin banners magement' do 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' + fill_in 'banner_target_url', with: 'https://www.url.com' last_week = Time.now - 7.days next_week = Time.now + 7.days fill_in 'post_started_at', with: last_week.strftime("%d/%m/%Y") @@ -98,7 +98,7 @@ feature 'Admin banners magement' do 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' + expect(page).to have_link 'Such banner many text wow link', href: 'https://www.url.com' end scenario 'Edit banner with live refresh', :js do diff --git a/spec/features/comments/debates_spec.rb b/spec/features/comments/debates_spec.rb index d80b08bc0..d9e58343a 100644 --- a/spec/features/comments/debates_spec.rb +++ b/spec/features/comments/debates_spec.rb @@ -118,13 +118,13 @@ feature 'Commenting debates' do end scenario 'Sanitizes comment body for security' do - create :comment, commentable: debate, body: "     click me http://madrid.es" + create :comment, commentable: debate, body: " click me http://www.url.com" visit debate_path(debate) within first('.comment') do - expect(page).to have_content "click me http://madrid.es" - expect(page).to have_link('http://madrid.es', href: 'http://madrid.es') + expect(page).to have_content "click me http://www.url.com" + expect(page).to have_link('http://www.url.com', href: 'http://www.url.com') expect(page).not_to have_link('click me') end end diff --git a/spec/features/comments/proposals_spec.rb b/spec/features/comments/proposals_spec.rb index 8312176cd..a861615b7 100644 --- a/spec/features/comments/proposals_spec.rb +++ b/spec/features/comments/proposals_spec.rb @@ -118,13 +118,13 @@ feature 'Commenting proposals' do end scenario 'Sanitizes comment body for security' do - create :comment, commentable: proposal, body: " click me http://madrid.es" + create :comment, commentable: proposal, body: " click me http://www.url.com" visit proposal_path(proposal) within first('.comment') do - expect(page).to have_content "click me http://madrid.es" - expect(page).to have_link('http://madrid.es', href: 'http://madrid.es') + expect(page).to have_content "click me http://www.url.com" + expect(page).to have_link('http://www.url.com', href: 'http://www.url.com') expect(page).not_to have_link('click me') end end diff --git a/spec/features/verification/letter_spec.rb b/spec/features/verification/letter_spec.rb index 50635a73c..9a9b2500b 100644 --- a/spec/features/verification/letter_spec.rb +++ b/spec/features/verification/letter_spec.rb @@ -26,7 +26,7 @@ feature 'Verify Letter' do login_as(user) visit new_letter_path - expect(page).to have_link "Citizen Support Offices", href: "http://www.madrid.es/portales/munimadrid/es/Inicio/El-Ayuntamiento/Atencion-al-ciudadano/Oficinas-de-Atencion-al-Ciudadano?vgnextfmt=default&vgnextchannel=5b99cde2e09a4310VgnVCM1000000b205a0aRCRD" + expect(page).to have_link "Citizen Support Offices", href: "http://offices.consul" end scenario "Deny access unless verified residence" do diff --git a/spec/features/verification/residence_spec.rb b/spec/features/verification/residence_spec.rb index 1961269da..88d1579a9 100644 --- a/spec/features/verification/residence_spec.rb +++ b/spec/features/verification/residence_spec.rb @@ -4,7 +4,7 @@ feature 'Residence' do background { create(:geozone) } - scenario 'Verify resident in Madrid' do + scenario 'Verify resident' do user = create(:user) login_as(user) @@ -34,7 +34,7 @@ feature 'Residence' do expect(page).to have_content /\d errors? prevented the verification of your residence/ end - scenario 'Error on postal code not in Madrid census' do + scenario 'Error on postal code not in census' do user = create(:user) login_as(user) @@ -51,10 +51,10 @@ feature 'Residence' do click_button 'Verify residence' - expect(page).to have_content 'In order to be verified, you must be registered in the municipality of Madrid' + expect(page).to have_content 'In order to be verified, you must be registered' end - scenario 'Error on Madrid census' do + scenario 'Error on census' do user = create(:user) login_as(user) @@ -71,7 +71,7 @@ feature 'Residence' do click_button 'Verify residence' - expect(page).to have_content 'The Madrid Census was unable to verify your information' + expect(page).to have_content 'The Census was unable to verify your information' end scenario '5 tries allowed' do @@ -91,7 +91,7 @@ feature 'Residence' do check 'residence_terms_of_service' click_button 'Verify residence' - expect(page).to have_content 'The Madrid Census was unable to verify your information' + expect(page).to have_content 'The Census was unable to verify your information' end click_button 'Verify residence' diff --git a/spec/models/residence_spec.rb b/spec/models/residence_spec.rb index ce151eaee..5288a20b5 100644 --- a/spec/models/residence_spec.rb +++ b/spec/models/residence_spec.rb @@ -49,7 +49,7 @@ describe Verification::Residence do residence.postal_code = "13280" residence.valid? expect(residence.errors[:postal_code].size).to eq(1) - expect(residence.errors[:postal_code]).to include("In order to be verified, you must be registered in the municipality of Madrid.") + expect(residence.errors[:postal_code]).to include("In order to be verified, you must be registered.") end end From 67f07ba73a9dc4ea27cc379fdd8c99ab79d52395 Mon Sep 17 00:00:00 2001 From: Alberto Garcia Cabeza Date: Wed, 6 Jul 2016 14:48:51 +0200 Subject: [PATCH 101/126] Fixes typo --- spec/features/official_positions_spec.rb | 1 - 1 file changed, 1 deletion(-) diff --git a/spec/features/official_positions_spec.rb b/spec/features/official_positions_spec.rb index ff31c0a27..01f78370a 100644 --- a/spec/features/official_positions_spec.rb +++ b/spec/features/official_positions_spec.rb @@ -55,7 +55,6 @@ feature 'Official positions' do scenario "Index" do visit proposals_path - debugger expect_badge_for("proposal", @proposal1) expect_no_badge_for("proposal", @proposal2) From 811dcc20b2a3c6c032500f2b57996cf7380379bb Mon Sep 17 00:00:00 2001 From: Alberto Garcia Cabeza Date: Fri, 8 Jul 2016 10:50:55 +0200 Subject: [PATCH 102/126] Updates Gemfile --- Gemfile | 2 +- Gemfile.lock | 14 ++++---------- 2 files changed, 5 insertions(+), 11 deletions(-) diff --git a/Gemfile b/Gemfile index 31743146f..d5c8f3838 100644 --- a/Gemfile +++ b/Gemfile @@ -37,7 +37,7 @@ gem 'acts_as_votable' gem 'ckeditor', '~> 4.1.5' gem 'invisible_captcha', '~> 0.8.2' gem 'cancancan' -gem 'social-share-button', git: 'https://github.com/huacnlee/social-share-button.git', ref: 'e46a6a3e82b86023bc' +gem 'social-share-button' gem 'initialjs-rails', '0.2.0.1' gem 'unicorn', '~> 5.1.0' gem 'paranoia' diff --git a/Gemfile.lock b/Gemfile.lock index b420e7327..bbb81b63e 100644 --- a/Gemfile.lock +++ b/Gemfile.lock @@ -1,12 +1,3 @@ -GIT - remote: https://github.com/huacnlee/social-share-button.git - revision: e46a6a3e82b86023bc43b72c9379d3c6afe36b6b - ref: e46a6a3e82b86023bc - specs: - social-share-button (0.1.9) - coffee-rails - sass-rails - GEM remote: https://rubygems.org/ specs: @@ -374,6 +365,9 @@ GEM json (~> 1.8) simplecov-html (~> 0.10.0) simplecov-html (0.10.0) + social-share-button (0.3.1) + coffee-rails + sass-rails spring (1.7.1) spring-commands-rspec (1.0.4) spring (>= 0.9.1) @@ -495,7 +489,7 @@ DEPENDENCIES rspec-rails (~> 3.3) sass-rails (~> 5.0, >= 5.0.4) savon - social-share-button! + social-share-button spring spring-commands-rspec tolk From e55fdc42ee607292341c7ae90a4b2f14ddee03a2 Mon Sep 17 00:00:00 2001 From: Alberto Garcia Cabeza Date: Fri, 8 Jul 2016 14:13:13 +0200 Subject: [PATCH 103/126] Updates classes names for social share button --- app/assets/stylesheets/layout.scss | 27 +++++++++++++---------- app/assets/stylesheets/participation.scss | 12 +++++----- 2 files changed, 21 insertions(+), 18 deletions(-) diff --git a/app/assets/stylesheets/layout.scss b/app/assets/stylesheets/layout.scss index 0ec0c12eb..b99f0300a 100644 --- a/app/assets/stylesheets/layout.scss +++ b/app/assets/stylesheets/layout.scss @@ -1085,12 +1085,13 @@ table { } } -.social-share-button-twitter { +.ssb-twitter { background: #45B0E3; + background-image: none !important; color: white; - height: $line-height*2; + height: $line-height*2 !important; position: relative; - width: $line-height*2; + width: $line-height*2 !important; &:before { content: "f"; @@ -1124,12 +1125,13 @@ table { } } -.social-share-button-facebook { +.ssb-facebook { background: #3B5998; + background-image: none !important; color: white; - height: rem-calc(48); + height: rem-calc(48) !important; position: relative; - width: rem-calc(48); + width: rem-calc(48) !important; &:before { content: "A"; @@ -1163,12 +1165,13 @@ table { } } -.social-share-button-google_plus { +.ssb-google_plus { background: #DE4C34; + background-image: none !important; color: white; - height: $line-height*2; + height: $line-height*2 !important; position: relative; - width: $line-height*2; + width: $line-height*2 !important; &:before { content: "B"; @@ -1206,7 +1209,7 @@ table { display: inline-block; } - .social-share-button-twitter { + .ssb-twitter { background: none; color: white; height: $line-height; @@ -1229,7 +1232,7 @@ table { } } - .social-share-button-facebook { + .ssb-facebook { background: none; color: white; height: rem-calc(24); @@ -1252,7 +1255,7 @@ table { } } - .social-share-button-google_plus { + .ssb-google_plus { background: none; color: white; height: rem-calc(24); diff --git a/app/assets/stylesheets/participation.scss b/app/assets/stylesheets/participation.scss index 6e5b4273a..ffe08617f 100644 --- a/app/assets/stylesheets/participation.scss +++ b/app/assets/stylesheets/participation.scss @@ -900,9 +900,9 @@ .share-supported { - .social-share-button-twitter, - .social-share-button-facebook, - .social-share-button-google_plus { + .ssb-twitter, + .ssb-facebook, + .ssb-google_plus { color: $budget; } } @@ -1016,9 +1016,9 @@ .share-supported { - .social-share-button-twitter, - .social-share-button-facebook, - .social-share-button-google_plus { + .ssb-twitter, + .ssb-facebook, + .ssb-google_plus { height: rem-calc(33); &:before { From 7f01dbdca239a9969f8ce09c4d2197b9d9ec87e5 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Juanjo=20Baz=C3=A1n?= Date: Fri, 8 Jul 2016 14:42:28 +0200 Subject: [PATCH 104/126] makes sure setting helper is used in views --- app/views/admin/dashboard/index.html.erb | 2 +- app/views/layouts/_admin_header.html.erb | 4 ++-- app/views/layouts/_header.html.erb | 2 +- app/views/layouts/management.html.erb | 4 ++-- app/views/moderation/dashboard/index.html.erb | 2 +- app/views/shared/_top_links.html.erb | 6 +++--- app/views/welcome/verification.html.erb | 2 +- 7 files changed, 11 insertions(+), 11 deletions(-) diff --git a/app/views/admin/dashboard/index.html.erb b/app/views/admin/dashboard/index.html.erb index 0b4fad794..793b4e407 100644 --- a/app/views/admin/dashboard/index.html.erb +++ b/app/views/admin/dashboard/index.html.erb @@ -1,4 +1,4 @@ -<%= link_to t("admin.dashboard.index.back") + " " + Setting['org_name'], root_path, class: "button float-right" %> +<%= link_to t("admin.dashboard.index.back") + " " + setting['org_name'], root_path, class: "button float-right" %>

    <%= t("admin.dashboard.index.title") %>

    diff --git a/app/views/layouts/_admin_header.html.erb b/app/views/layouts/_admin_header.html.erb index 2b15faaaa..095e351d6 100644 --- a/app/views/layouts/_admin_header.html.erb +++ b/app/views/layouts/_admin_header.html.erb @@ -8,7 +8,7 @@
    - <%= link_to Setting['org_name'], admin_root_path, class: "logo show-for-small-only" %> + <%= link_to setting['org_name'], admin_root_path, class: "logo show-for-small-only" %> @@ -19,7 +19,7 @@
    <%= link_to admin_root_path, class: "hide-for-small-only" do %> <%= image_tag('logo_header.png', class: 'hide-for-small-only float-left', size: '80x80', alt: t("layouts.header.logo")) %> - <%= Setting['org_name'] %> + <%= setting['org_name'] %>  | <%= t("admin.dashboard.index.title") %> <% end %>
    diff --git a/app/views/layouts/_header.html.erb b/app/views/layouts/_header.html.erb index 16c81fb50..2ad2303f8 100644 --- a/app/views/layouts/_header.html.erb +++ b/app/views/layouts/_header.html.erb @@ -5,7 +5,7 @@
    - <%= link_to Setting['org_name'], root_path, class: "logo show-for-small-only" %> + <%= link_to setting['org_name'], root_path, class: "logo show-for-small-only" %> diff --git a/app/views/layouts/management.html.erb b/app/views/layouts/management.html.erb index 2607f1b82..8e497bf24 100644 --- a/app/views/layouts/management.html.erb +++ b/app/views/layouts/management.html.erb @@ -25,7 +25,7 @@
    - <%= link_to Setting['org_name'], management_root_path, class: "logo show-for-small-only" %> + <%= link_to setting['org_name'], management_root_path, class: "logo show-for-small-only" %> @@ -36,7 +36,7 @@
    <%= link_to management_root_path, class: "hide-for-small-only" do %> <%= image_tag('logo_header.png', class: 'hide-for-small-only float-left', size: '80x80', alt: t("layouts.header.logo")) %> - <%= Setting['org_name'] %> + <%= setting['org_name'] %>  | <%= t("management.dashboard.index.title") %> <% end %>
    diff --git a/app/views/moderation/dashboard/index.html.erb b/app/views/moderation/dashboard/index.html.erb index aa214c561..acdfa954a 100644 --- a/app/views/moderation/dashboard/index.html.erb +++ b/app/views/moderation/dashboard/index.html.erb @@ -1,4 +1,4 @@ -<%= link_to t("admin.dashboard.index.back") + " " + Setting['org_name'], root_path, class: "button float-right" %> +<%= link_to t("admin.dashboard.index.back") + " " + setting['org_name'], root_path, class: "button float-right" %>

    <%= t("moderation.dashboard.index.title") %>

    diff --git a/app/views/shared/_top_links.html.erb b/app/views/shared/_top_links.html.erb index 07973ee60..be6afb0d7 100644 --- a/app/views/shared/_top_links.html.erb +++ b/app/views/shared/_top_links.html.erb @@ -2,12 +2,12 @@
    <%= render "shared/locale_switcher" %>
    - <%= link_to Setting['org_name'], root_path, class: ("selected" unless current_page?("/opendata")) %> | + <%= link_to setting['org_name'], root_path, class: ("selected" unless current_page?("/opendata")) %> | <%= link_to t("layouts.header.external_link_transparency"), t("layouts.header.external_link_transparency_url") %> | <%= link_to t("layouts.header.external_link_opendata"), "/opendata", class: ("selected" if current_page?("/opendata")) %> - <% if Setting['blog_url'] %> + <% if setting['blog_url'] %>  | - <%= link_to Setting['blog_url'], title: t('shared.target_blank_html'), target: "_blank" do %> + <%= link_to setting['blog_url'], title: t('shared.target_blank_html'), target: "_blank" do %> <%= t("layouts.header.external_link_blog") %> <% end %> <% end %> diff --git a/app/views/welcome/verification.html.erb b/app/views/welcome/verification.html.erb index 49fccea9c..6642c14e0 100644 --- a/app/views/welcome/verification.html.erb +++ b/app/views/welcome/verification.html.erb @@ -1,7 +1,7 @@

    <%= t("welcome.verification.title") %>

    -

    <%= t("welcome.verification.question", org_name: Setting["org_name"]) %>

    +

    <%= t("welcome.verification.question", org_name: setting["org_name"]) %>


    From c147ea227b56ee8020bcf7622b0c663403d6dcec Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Juanjo=20Baz=C3=A1n?= Date: Sun, 10 Jul 2016 23:24:02 +0200 Subject: [PATCH 105/126] updates dependencies --- Gemfile | 4 ++-- Gemfile.lock | 49 ++++++++++++++++++++++++------------------------- 2 files changed, 26 insertions(+), 27 deletions(-) diff --git a/Gemfile b/Gemfile index d5c8f3838..b595d5690 100644 --- a/Gemfile +++ b/Gemfile @@ -35,7 +35,7 @@ gem 'foundation-rails' gem 'foundation_rails_helper' gem 'acts_as_votable' gem 'ckeditor', '~> 4.1.5' -gem 'invisible_captcha', '~> 0.8.2' +gem 'invisible_captcha', '~> 0.9.1' gem 'cancancan' gem 'social-share-button' gem 'initialjs-rails', '0.2.0.1' @@ -44,7 +44,7 @@ gem 'paranoia' gem 'rinku', require: 'rails_rinku' gem 'savon' gem 'dalli' -gem 'rollbar', '~> 2.11.0' +gem 'rollbar', '~> 2.12.0' gem 'delayed_job_active_record', '~> 4.1.0' gem 'daemons' gem 'devise-async' diff --git a/Gemfile.lock b/Gemfile.lock index bbb81b63e..512138afc 100644 --- a/Gemfile.lock +++ b/Gemfile.lock @@ -65,10 +65,10 @@ GEM bcrypt (3.1.11) browser (2.1.0) builder (3.2.2) - bullet (5.1.0) + bullet (5.1.1) activesupport (>= 3.0.0) uniform_notifier (~> 1.10.0) - byebug (9.0.4) + byebug (9.0.5) cancancan (1.14.0) capistrano (3.4.1) i18n @@ -109,9 +109,9 @@ GEM execjs coffee-script-source (1.10.0) concurrent-ruby (1.0.2) - coveralls (0.8.13) - json (~> 1.8) - simplecov (~> 0.11.0) + coveralls (0.8.14) + json (>= 1.8, < 3) + simplecov (~> 0.12.0) term-ansicolor (~> 1.3) thor (~> 0.19.1) tins (~> 1.6.0) @@ -151,7 +151,7 @@ GEM factory_girl_rails (4.7.0) factory_girl (~> 4.7.0) railties (>= 3.0.0) - faker (1.6.3) + faker (1.6.5) i18n (~> 0.5) faraday (0.9.2) multipart-post (>= 1.2, < 3) @@ -171,7 +171,7 @@ GEM geocoder (1.3.4) globalid (0.3.6) activesupport (>= 4.1.0) - groupdate (2.5.3) + groupdate (3.0.0) activesupport (>= 3) gyoku (1.3.1) builder (>= 2.1.2) @@ -193,7 +193,7 @@ GEM terminal-table (>= 1.5.1) initialjs-rails (0.2.0.1) railties (>= 3.1, < 5.0) - invisible_captcha (0.8.2) + invisible_captcha (0.9.1) rails jquery-rails (4.1.1) rails-dom-testing (>= 1, < 3) @@ -203,7 +203,7 @@ GEM railties (>= 3.2.16) json (1.8.3) jwt (1.5.4) - kaminari (0.16.3) + kaminari (0.17.0) actionpack (>= 3.0.0) activesupport (>= 3.0.0) kgio (2.10.0) @@ -272,10 +272,9 @@ GEM activesupport (>= 3.1) arel pkg-config (1.1.7) - poltergeist (1.9.0) + poltergeist (1.10.0) capybara (~> 2.1) cliver (~> 0.3.1) - multi_json (~> 1.0) websocket-driver (>= 0.2.0) quiet_assets (1.1.0) railties (>= 3.1, < 5.0) @@ -311,14 +310,14 @@ GEM rake (>= 0.8.7) thor (>= 0.18.1, < 2.0) raindrops (0.16.0) - rake (11.1.2) + rake (11.2.2) redcarpet (3.3.4) referer-parser (0.3.0) request_store (1.3.1) responders (2.2.0) railties (>= 4.2.0, < 5.1) rinku (2.0.0) - rollbar (2.11.5) + rollbar (2.12.0) multi_json rspec (3.4.0) rspec-core (~> 3.4.0) @@ -346,8 +345,8 @@ GEM safely_block (0.1.0) errbase sass (3.4.22) - sass-rails (5.0.4) - railties (>= 4.0.0, < 5.0) + sass-rails (5.0.5) + railties (>= 4.0.0, < 6) sass (~> 3.1) sprockets (>= 2.8, < 4.0) sprockets-rails (>= 2.0, < 4.0) @@ -360,25 +359,25 @@ GEM nokogiri (>= 1.4.0) nori (~> 2.4) wasabi (~> 3.4) - simplecov (0.11.2) + simplecov (0.12.0) docile (~> 1.1.0) - json (~> 1.8) + json (>= 1.8, < 3) simplecov-html (~> 0.10.0) simplecov-html (0.10.0) social-share-button (0.3.1) coffee-rails sass-rails - spring (1.7.1) + spring (1.7.2) spring-commands-rspec (1.0.4) spring (>= 0.9.1) - sprockets (3.6.0) + sprockets (3.6.3) concurrent-ruby (~> 1.0) rack (> 1, < 3) sprockets-es6 (0.9.0) babel-source (>= 5.8.11) babel-transpiler sprockets (>= 3.0.0) - sprockets-rails (3.0.4) + sprockets-rails (3.1.1) actionpack (>= 4.0) activesupport (>= 4.0) sprockets (>= 3.0.0) @@ -391,7 +390,7 @@ GEM thor (0.19.1) thread (0.2.2) thread_safe (0.3.5) - tilt (2.0.4) + tilt (2.0.5) tins (1.6.0) tolk (1.9.3) rails (>= 4.0, < 4.3) @@ -421,10 +420,10 @@ GEM activemodel (>= 4.2) debug_inspector railties (>= 4.2) - websocket-driver (0.6.3) + websocket-driver (0.6.4) websocket-extensions (>= 0.1.0) websocket-extensions (0.1.2) - whenever (0.9.4) + whenever (0.9.7) chronic (>= 0.6.3) xpath (2.0.0) nokogiri (~> 1.3) @@ -465,7 +464,7 @@ DEPENDENCIES groupdate i18n-tasks initialjs-rails (= 0.2.0.1) - invisible_captcha (~> 0.8.2) + invisible_captcha (~> 0.9.1) jquery-rails jquery-ui-rails kaminari @@ -485,7 +484,7 @@ DEPENDENCIES redcarpet responders rinku - rollbar (~> 2.11.0) + rollbar (~> 2.12.0) rspec-rails (~> 3.3) sass-rails (~> 5.0, >= 5.0.4) savon From 8316d9d895d3e6065b319b29bc71ec9307057b2c Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Juanjo=20Baz=C3=A1n?= Date: Sun, 10 Jul 2016 23:24:42 +0200 Subject: [PATCH 106/126] fixes spec --- spec/controllers/debates_controller_spec.rb | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/spec/controllers/debates_controller_spec.rb b/spec/controllers/debates_controller_spec.rb index 12dc0fe40..4ea0d62b1 100644 --- a/spec/controllers/debates_controller_spec.rb +++ b/spec/controllers/debates_controller_spec.rb @@ -3,6 +3,10 @@ require 'rails_helper' describe DebatesController do describe 'POST create' do + before(:each) do + InvisibleCaptcha.timestamp_enabled = false + end + it 'should create an ahoy event' do sign_in create(:user) From 6b351de6a1f09c7635626e798ccda1267ef70ce2 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Juanjo=20Baz=C3=A1n?= Date: Mon, 11 Jul 2016 10:43:27 +0200 Subject: [PATCH 107/126] fixes build --- spec/controllers/debates_controller_spec.rb | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/spec/controllers/debates_controller_spec.rb b/spec/controllers/debates_controller_spec.rb index 4ea0d62b1..9ed478c40 100644 --- a/spec/controllers/debates_controller_spec.rb +++ b/spec/controllers/debates_controller_spec.rb @@ -7,6 +7,10 @@ describe DebatesController do InvisibleCaptcha.timestamp_enabled = false end + after(:each) do + InvisibleCaptcha.timestamp_enabled = true + end + it 'should create an ahoy event' do sign_in create(:user) From 23ff4d22035c13e2f9d8b1620b68c74566264621 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Juanjo=20Baz=C3=A1n?= Date: Mon, 11 Jul 2016 11:09:10 +0200 Subject: [PATCH 108/126] updates development dependencies --- Gemfile | 6 +++--- Gemfile.lock | 52 ++++++++++++++++++++++++++-------------------------- 2 files changed, 29 insertions(+), 29 deletions(-) diff --git a/Gemfile b/Gemfile index b595d5690..9c84c0f11 100644 --- a/Gemfile +++ b/Gemfile @@ -66,7 +66,7 @@ group :development, :test do # Spring speeds up development by keeping your application running in the background. Read more: https://github.com/rails/spring gem 'spring' gem 'spring-commands-rspec' - gem 'rspec-rails', '~> 3.3' + gem 'rspec-rails', '~> 3.5' gem 'capybara' gem 'factory_girl_rails' gem 'fuubar' @@ -76,7 +76,7 @@ group :development, :test do gem 'i18n-tasks' gem 'capistrano', '3.4.1', require: false gem "capistrano-bundler", '1.1.4', require: false - gem "capistrano-rails", '1.1.6', require: false + gem "capistrano-rails", '1.1.7', require: false gem "capistrano-rvm", require: false gem 'capistrano3-delayed-job', '~> 1.0' gem "bullet" @@ -92,5 +92,5 @@ end group :development do # Access an IRB console on exception pages or by using <%= console %> in views - gem 'web-console', '~> 3.0' + gem 'web-console', '3.3.0' end diff --git a/Gemfile.lock b/Gemfile.lock index 512138afc..ff4c9fc8c 100644 --- a/Gemfile.lock +++ b/Gemfile.lock @@ -77,7 +77,7 @@ GEM capistrano-bundler (1.1.4) capistrano (~> 3.1) sshkit (~> 1.2) - capistrano-rails (1.1.6) + capistrano-rails (1.1.7) capistrano (~> 3.1) capistrano-bundler (~> 1.1) capistrano-rvm (0.1.2) @@ -229,7 +229,7 @@ GEM multipart-post (2.0.0) net-scp (1.2.1) net-ssh (>= 2.6.5) - net-ssh (3.1.1) + net-ssh (3.2.0) newrelic_rpm (3.16.0.318) nokogiri (1.6.8) mini_portile2 (~> 2.1.0) @@ -319,27 +319,27 @@ GEM rinku (2.0.0) rollbar (2.12.0) multi_json - rspec (3.4.0) - rspec-core (~> 3.4.0) - rspec-expectations (~> 3.4.0) - rspec-mocks (~> 3.4.0) - rspec-core (3.4.4) - rspec-support (~> 3.4.0) - rspec-expectations (3.4.0) + rspec (3.5.0) + rspec-core (~> 3.5.0) + rspec-expectations (~> 3.5.0) + rspec-mocks (~> 3.5.0) + rspec-core (3.5.1) + rspec-support (~> 3.5.0) + rspec-expectations (3.5.0) diff-lcs (>= 1.2.0, < 2.0) - rspec-support (~> 3.4.0) - rspec-mocks (3.4.1) + rspec-support (~> 3.5.0) + rspec-mocks (3.5.0) diff-lcs (>= 1.2.0, < 2.0) - rspec-support (~> 3.4.0) - rspec-rails (3.4.2) - actionpack (>= 3.0, < 4.3) - activesupport (>= 3.0, < 4.3) - railties (>= 3.0, < 4.3) - rspec-core (~> 3.4.0) - rspec-expectations (~> 3.4.0) - rspec-mocks (~> 3.4.0) - rspec-support (~> 3.4.0) - rspec-support (3.4.1) + rspec-support (~> 3.5.0) + rspec-rails (3.5.1) + actionpack (>= 3.0) + activesupport (>= 3.0) + railties (>= 3.0) + rspec-core (~> 3.5.0) + rspec-expectations (~> 3.5.0) + rspec-mocks (~> 3.5.0) + rspec-support (~> 3.5.0) + rspec-support (3.5.0) ruby-progressbar (1.7.5) safe_yaml (1.0.4) safely_block (0.1.0) @@ -381,7 +381,7 @@ GEM actionpack (>= 4.0) activesupport (>= 4.0) sprockets (>= 3.0.0) - sshkit (1.10.0) + sshkit (1.11.1) net-scp (>= 1.1.2) net-ssh (>= 2.8.0) term-ansicolor (1.3.2) @@ -416,7 +416,7 @@ GEM wasabi (3.5.0) httpi (~> 2.0) nokogiri (>= 1.4.2) - web-console (3.1.1) + web-console (3.3.0) activemodel (>= 4.2) debug_inspector railties (>= 4.2) @@ -442,7 +442,7 @@ DEPENDENCIES cancancan capistrano (= 3.4.1) capistrano-bundler (= 1.1.4) - capistrano-rails (= 1.1.6) + capistrano-rails (= 1.1.7) capistrano-rvm capistrano3-delayed-job (~> 1.0) capybara @@ -485,7 +485,7 @@ DEPENDENCIES responders rinku rollbar (~> 2.12.0) - rspec-rails (~> 3.3) + rspec-rails (~> 3.5) sass-rails (~> 5.0, >= 5.0.4) savon social-share-button @@ -496,7 +496,7 @@ DEPENDENCIES turnout uglifier (>= 1.3.0) unicorn (~> 5.1.0) - web-console (~> 3.0) + web-console (= 3.3.0) whenever BUNDLED WITH From fd157c62301548eb01b648318fec53fab46c9592 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Juanjo=20Baz=C3=A1n?= Date: Mon, 11 Jul 2016 12:23:11 +0200 Subject: [PATCH 109/126] updates dependencies --- Gemfile.lock | 20 ++++++++++---------- 1 file changed, 10 insertions(+), 10 deletions(-) diff --git a/Gemfile.lock b/Gemfile.lock index ff4c9fc8c..39a57aee3 100644 --- a/Gemfile.lock +++ b/Gemfile.lock @@ -40,7 +40,7 @@ GEM activerecord (>= 3.2, < 5) acts_as_votable (0.10.0) addressable (2.4.0) - ahoy_matey (1.4.0) + ahoy_matey (1.4.2) addressable browser (~> 2.0) geocoder @@ -48,7 +48,7 @@ GEM railties referer-parser (>= 0.3.0) request_store - safely_block + safely_block (>= 0.1.1) user_agent_parser uuidtools akami (1.3.1) @@ -63,13 +63,13 @@ GEM babel-source (>= 4.0, < 6) execjs (~> 2.0) bcrypt (3.1.11) - browser (2.1.0) + browser (2.2.0) builder (3.2.2) bullet (5.1.1) activesupport (>= 3.0.0) uniform_notifier (~> 1.10.0) byebug (9.0.5) - cancancan (1.14.0) + cancancan (1.15.0) capistrano (3.4.1) i18n rake (>= 10.0.0) @@ -124,15 +124,15 @@ GEM delayed_job_active_record (4.1.1) activerecord (>= 3.0, < 5.1) delayed_job (>= 3.0, < 5) - devise (3.5.7) + devise (3.5.10) bcrypt (~> 3.0) orm_adapter (~> 0.1) railties (>= 3.2.6, < 5) responders thread_safe (~> 0.1) warden (~> 1.2.3) - devise-async (0.10.1) - devise (~> 3.2) + devise-async (0.10.2) + devise (>= 3.2, < 4.0) diff-lcs (1.2.5) docile (1.1.5) easy_translate (0.5.0) @@ -145,7 +145,7 @@ GEM mail (~> 2.6.3) errbase (0.0.3) erubis (2.7.0) - execjs (2.6.0) + execjs (2.7.0) factory_girl (4.7.0) activesupport (>= 3.0.0) factory_girl_rails (4.7.0) @@ -168,7 +168,7 @@ GEM fuubar (2.0.0) rspec (~> 3.0) ruby-progressbar (~> 1.4) - geocoder (1.3.4) + geocoder (1.3.7) globalid (0.3.6) activesupport (>= 4.1.0) groupdate (3.0.0) @@ -342,7 +342,7 @@ GEM rspec-support (3.5.0) ruby-progressbar (1.7.5) safe_yaml (1.0.4) - safely_block (0.1.0) + safely_block (0.1.1) errbase sass (3.4.22) sass-rails (5.0.5) From 511d22361256569b2e22ab621876adee9107ba69 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Juanjo=20Baz=C3=A1n?= Date: Mon, 11 Jul 2016 12:53:09 +0200 Subject: [PATCH 110/126] updates dependencies coffee-rails, foundation_rails_helper --- Gemfile | 2 +- Gemfile.lock | 16 ++++++++-------- 2 files changed, 9 insertions(+), 9 deletions(-) diff --git a/Gemfile b/Gemfile index 9c84c0f11..e23636192 100644 --- a/Gemfile +++ b/Gemfile @@ -9,7 +9,7 @@ gem 'sass-rails', '~> 5.0', '>= 5.0.4' # Use Uglifier as compressor for JavaScript assets gem 'uglifier', '>= 1.3.0' # Use CoffeeScript for .coffee assets and views -gem 'coffee-rails', '~> 4.1.0' +gem 'coffee-rails', '~> 4.2.1' # See https://github.com/rails/execjs#readme for more supported runtimes # gem 'therubyracer', platforms: :ruby diff --git a/Gemfile.lock b/Gemfile.lock index 39a57aee3..635db8a43 100644 --- a/Gemfile.lock +++ b/Gemfile.lock @@ -101,9 +101,9 @@ GEM cliver (0.3.2) cocaine (0.5.8) climate_control (>= 0.0.3, < 1.0) - coffee-rails (4.1.1) + coffee-rails (4.2.1) coffee-script (>= 2.2.0) - railties (>= 4.0.0, < 5.1.x) + railties (>= 4.0.0, < 5.2.x) coffee-script (2.4.1) coffee-script-source execjs @@ -159,11 +159,11 @@ GEM railties (>= 3.1.0) sass (>= 3.3.0, < 3.5) sprockets-es6 (>= 0.9.0) - foundation_rails_helper (1.1.0) - actionpack (~> 4.1) - activemodel (~> 4.1) - activesupport (~> 4.1) - railties (~> 4.1) + foundation_rails_helper (1.2.1) + actionpack (>= 4.1) + activemodel (>= 4.1) + activesupport (>= 4.1) + railties (>= 4.1) tzinfo (~> 1.2, >= 1.2.2) fuubar (2.0.0) rspec (~> 3.0) @@ -447,7 +447,7 @@ DEPENDENCIES capistrano3-delayed-job (~> 1.0) capybara ckeditor (~> 4.1.5) - coffee-rails (~> 4.1.0) + coffee-rails (~> 4.2.1) coveralls daemons dalli From 631dd508561f785ebca3de2559a8b79bf75f35cb Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Juanjo=20Baz=C3=A1n?= Date: Mon, 11 Jul 2016 14:21:41 +0200 Subject: [PATCH 111/126] updates deprecated require in Capfile --- Capfile | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Capfile b/Capfile index 372653a5e..0f53b8e9a 100644 --- a/Capfile +++ b/Capfile @@ -9,7 +9,7 @@ require 'capistrano/bundler' require 'capistrano/rails/assets' require 'capistrano/rails/migrations' #require 'capistrano/passenger' -require 'capistrano/delayed-job' +require 'capistrano/delayed_job' require 'whenever/capistrano' # Load custom tasks from `lib/capistrano/tasks` if you have any defined From 575d9a19989e0de4647828a52f94ae7723e49915 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Juanjo=20Baz=C3=A1n?= Date: Mon, 11 Jul 2016 14:21:54 +0200 Subject: [PATCH 112/126] updates capistrano --- Gemfile | 2 +- Gemfile.lock | 11 ++++++++--- config/deploy.rb | 2 +- 3 files changed, 10 insertions(+), 5 deletions(-) diff --git a/Gemfile b/Gemfile index e23636192..9c22b5f60 100644 --- a/Gemfile +++ b/Gemfile @@ -74,7 +74,7 @@ group :development, :test do gem 'quiet_assets' gem 'letter_opener_web', '~> 1.3.0' gem 'i18n-tasks' - gem 'capistrano', '3.4.1', require: false + gem 'capistrano', '3.5.0', require: false gem "capistrano-bundler", '1.1.4', require: false gem "capistrano-rails", '1.1.7', require: false gem "capistrano-rvm", require: false diff --git a/Gemfile.lock b/Gemfile.lock index 635db8a43..f7a23b11f 100644 --- a/Gemfile.lock +++ b/Gemfile.lock @@ -51,6 +51,8 @@ GEM safely_block (>= 0.1.1) user_agent_parser uuidtools + airbrussh (1.0.2) + sshkit (>= 1.6.1, != 1.7.0) akami (1.3.1) gyoku (>= 0.4.0) nokogiri @@ -70,13 +72,16 @@ GEM uniform_notifier (~> 1.10.0) byebug (9.0.5) cancancan (1.15.0) - capistrano (3.4.1) + capistrano (3.5.0) + airbrussh (>= 1.0.0) + capistrano-harrow i18n rake (>= 10.0.0) - sshkit (~> 1.3) + sshkit (>= 1.9.0) capistrano-bundler (1.1.4) capistrano (~> 3.1) sshkit (~> 1.2) + capistrano-harrow (0.5.2) capistrano-rails (1.1.7) capistrano (~> 3.1) capistrano-bundler (~> 1.1) @@ -440,7 +445,7 @@ DEPENDENCIES bullet byebug cancancan - capistrano (= 3.4.1) + capistrano (= 3.5.0) capistrano-bundler (= 1.1.4) capistrano-rails (= 1.1.7) capistrano-rvm diff --git a/config/deploy.rb b/config/deploy.rb index 6c1af4b9d..46cbbfa9f 100644 --- a/config/deploy.rb +++ b/config/deploy.rb @@ -1,5 +1,5 @@ # config valid only for current version of Capistrano -lock '3.4.1' +lock '3.5.0' def deploysecret(key) @deploy_secrets_yml ||= YAML.load_file('config/deploy-secrets.yml')[fetch(:stage).to_s] From f91385873aea39e5d5765bf98aa4cd5d55102587 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Juanjo=20Baz=C3=A1n?= Date: Tue, 12 Jul 2016 11:21:15 +0200 Subject: [PATCH 113/126] updates ruby version in deploy.rb to 2.3.1 --- config/deploy.rb | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/config/deploy.rb b/config/deploy.rb index 46cbbfa9f..884d50641 100644 --- a/config/deploy.rb +++ b/config/deploy.rb @@ -7,7 +7,7 @@ def deploysecret(key) end set :rails_env, fetch(:stage) -set :rvm_ruby_version, '2.2.3' +set :rvm_ruby_version, '2.3.1' set :rvm_type, :user set :application, 'consul' From 1b5f7a0e6eff8ebae86986e08abfd272658d1ca7 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Juanjo=20Baz=C3=A1n?= Date: Wed, 13 Jul 2016 11:48:59 +0200 Subject: [PATCH 114/126] rails up! --- Gemfile | 2 +- Gemfile.lock | 60 ++++++++++++++++++++++++++-------------------------- 2 files changed, 31 insertions(+), 31 deletions(-) diff --git a/Gemfile b/Gemfile index 9c22b5f60..7c5711a18 100644 --- a/Gemfile +++ b/Gemfile @@ -1,7 +1,7 @@ source 'https://rubygems.org' # Bundle edge Rails instead: gem 'rails', github: 'rails/rails' -gem 'rails', '4.2.6' +gem 'rails', '4.2.7' # Use PostgreSQL gem 'pg' # Use SCSS for stylesheets diff --git a/Gemfile.lock b/Gemfile.lock index f7a23b11f..7ee8226d8 100644 --- a/Gemfile.lock +++ b/Gemfile.lock @@ -1,36 +1,36 @@ GEM remote: https://rubygems.org/ specs: - actionmailer (4.2.6) - actionpack (= 4.2.6) - actionview (= 4.2.6) - activejob (= 4.2.6) + actionmailer (4.2.7) + actionpack (= 4.2.7) + actionview (= 4.2.7) + activejob (= 4.2.7) mail (~> 2.5, >= 2.5.4) rails-dom-testing (~> 1.0, >= 1.0.5) - actionpack (4.2.6) - actionview (= 4.2.6) - activesupport (= 4.2.6) + actionpack (4.2.7) + actionview (= 4.2.7) + activesupport (= 4.2.7) rack (~> 1.6) rack-test (~> 0.6.2) rails-dom-testing (~> 1.0, >= 1.0.5) rails-html-sanitizer (~> 1.0, >= 1.0.2) - actionview (4.2.6) - activesupport (= 4.2.6) + actionview (4.2.7) + activesupport (= 4.2.7) builder (~> 3.1) erubis (~> 2.7.0) rails-dom-testing (~> 1.0, >= 1.0.5) rails-html-sanitizer (~> 1.0, >= 1.0.2) - activejob (4.2.6) - activesupport (= 4.2.6) + activejob (4.2.7) + activesupport (= 4.2.7) globalid (>= 0.3.0) - activemodel (4.2.6) - activesupport (= 4.2.6) + activemodel (4.2.7) + activesupport (= 4.2.7) builder (~> 3.1) - activerecord (4.2.6) - activemodel (= 4.2.6) - activesupport (= 4.2.6) + activerecord (4.2.7) + activemodel (= 4.2.7) + activesupport (= 4.2.7) arel (~> 6.0) - activesupport (4.2.6) + activesupport (4.2.7) i18n (~> 0.7) json (~> 1.7, >= 1.7.7) minitest (~> 5.1) @@ -290,16 +290,16 @@ GEM rack rack-test (0.6.3) rack (>= 1.0) - rails (4.2.6) - actionmailer (= 4.2.6) - actionpack (= 4.2.6) - actionview (= 4.2.6) - activejob (= 4.2.6) - activemodel (= 4.2.6) - activerecord (= 4.2.6) - activesupport (= 4.2.6) + rails (4.2.7) + actionmailer (= 4.2.7) + actionpack (= 4.2.7) + actionview (= 4.2.7) + activejob (= 4.2.7) + activemodel (= 4.2.7) + activerecord (= 4.2.7) + activesupport (= 4.2.7) bundler (>= 1.3.0, < 2.0) - railties (= 4.2.6) + railties (= 4.2.7) sprockets-rails rails-deprecated_sanitizer (1.0.3) activesupport (>= 4.2.0.alpha) @@ -309,9 +309,9 @@ GEM rails-deprecated_sanitizer (>= 1.0.1) rails-html-sanitizer (1.0.3) loofah (~> 2.0) - railties (4.2.6) - actionpack (= 4.2.6) - activesupport (= 4.2.6) + railties (4.2.7) + actionpack (= 4.2.7) + activesupport (= 4.2.7) rake (>= 0.8.7) thor (>= 0.18.1, < 2.0) raindrops (0.16.0) @@ -485,7 +485,7 @@ DEPENDENCIES pg_search poltergeist quiet_assets - rails (= 4.2.6) + rails (= 4.2.7) redcarpet responders rinku From cf50b3743c01c7c43fef53ec390b8691f11b14e6 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Juanjo=20Baz=C3=A1n?= Date: Wed, 13 Jul 2016 12:06:12 +0200 Subject: [PATCH 115/126] updates travis' script --- .travis.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.travis.yml b/.travis.yml index a45f36990..22f9768a8 100644 --- a/.travis.yml +++ b/.travis.yml @@ -7,4 +7,4 @@ cache: bundler before_script: - "for i in config/*.example; do cp \"$i\" \"${i/.example}\"; done" - bundle exec rake db:setup -script: bundle exec rake +script: bin/rspec spec -f Fuubar From 616e8abe2882bd30bbf72c82ae1f8eb385453344 Mon Sep 17 00:00:00 2001 From: Alberto Garcia Cabeza Date: Wed, 13 Jul 2016 14:22:24 +0200 Subject: [PATCH 116/126] Updates foundation rails gem --- Gemfile.lock | 2 +- app/assets/stylesheets/_settings.scss | 4 ++-- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/Gemfile.lock b/Gemfile.lock index 7ee8226d8..9df1a9826 100644 --- a/Gemfile.lock +++ b/Gemfile.lock @@ -160,7 +160,7 @@ GEM i18n (~> 0.5) faraday (0.9.2) multipart-post (>= 1.2, < 3) - foundation-rails (6.2.1.0) + foundation-rails (6.2.3.0) railties (>= 3.1.0) sass (>= 3.3.0, < 3.5) sprockets-es6 (>= 0.9.0) diff --git a/app/assets/stylesheets/_settings.scss b/app/assets/stylesheets/_settings.scss index 57a1afb7c..44433938b 100644 --- a/app/assets/stylesheets/_settings.scss +++ b/app/assets/stylesheets/_settings.scss @@ -259,12 +259,12 @@ $input-error-font-weight: $global-weight-bold; $accordion-background: $white; $accordion-plusminus: true; -$accordion-item-color: foreground($accordion-background, $primary-color); +$accordion-item-color: foreground($accordion-background, $text); $accordion-item-background-hover: $light-gray; $accordion-item-padding: 1.25rem 1rem; $accordion-content-background: $white; $accordion-content-border: 1px solid $light-gray; -$accordion-content-color: foreground($accordion-background, $primary-color); +$accordion-content-color: foreground($accordion-background, $text); $accordion-content-padding: 1rem; // 8. Accordion Menu From 9144c7da05deab8b60d7f8997eff58e243e68ad6 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Juanjo=20Baz=C3=A1n?= Date: Thu, 14 Jul 2016 14:01:25 +0200 Subject: [PATCH 117/126] changes travis script this commit reverts cf50b3743c0 because Fuubar format does not works well with travis/coveralls --- .travis.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.travis.yml b/.travis.yml index 22f9768a8..a45f36990 100644 --- a/.travis.yml +++ b/.travis.yml @@ -7,4 +7,4 @@ cache: bundler before_script: - "for i in config/*.example; do cp \"$i\" \"${i/.example}\"; done" - bundle exec rake db:setup -script: bin/rspec spec -f Fuubar +script: bundle exec rake From c5e6735caa844da70acb5653dcc8ad3a823e8df5 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Andr=C3=A9s=20Pereira?= Date: Thu, 14 Jul 2016 16:28:16 +0200 Subject: [PATCH 118/126] Change madrid.es to consul.dev - closes #1169 --- README.md | 4 ++-- README_ES.md | 4 ++-- db/dev_seeds.rb | 16 ++++++++-------- db/seeds.rb | 2 +- doc/locales/fr.yaml | 2 +- doc/locales/pt-br.yaml | 4 ++-- spec/factories.rb | 4 ++-- spec/features/emails_spec.rb | 6 +++--- spec/features/registration_form_spec.rb | 2 +- spec/features/users_auth_spec.rb | 14 +++++++------- spec/models/user_spec.rb | 6 +++--- spec/support/common_actions.rb | 6 +++--- 12 files changed, 35 insertions(+), 35 deletions(-) diff --git a/README.md b/README.md index 025ebaaf7..18fbc4881 100644 --- a/README.md +++ b/README.md @@ -54,12 +54,12 @@ bin/rspec You can use the default admin user from the seeds file: - **user:** admin@madrid.es + **user:** admin@consul.dev **pass:** 12345678 But for some actions like voting, you will need a verified user, the seeds file also includes one: - **user:** verified@madrid.es + **user:** verified@consul.dev **pass:** 12345678 ### OAuth diff --git a/README_ES.md b/README_ES.md index a15763604..3120f60a0 100644 --- a/README_ES.md +++ b/README_ES.md @@ -53,12 +53,12 @@ bin/rspec Puedes usar el usuario administrador por defecto del fichero seeds: - **user:** admin@madrid.es + **user:** admin@consul.dev **pass:** 12345678 Pero para ciertas acciones, como apoyar, necesitarás un usuario verificado, el fichero seeds proporciona uno: - **user:** verified@madrid.es + **user:** verified@consul.dev **pass:** 12345678 diff --git a/db/dev_seeds.rb b/db/dev_seeds.rb index c25bf426c..61b5f5060 100644 --- a/db/dev_seeds.rb +++ b/db/dev_seeds.rb @@ -43,24 +43,24 @@ def create_user(email, username = Faker::Name.name) User.create!(username: username, email: email, password: pwd, password_confirmation: pwd, confirmed_at: Time.now, terms_of_service: "1") end -admin = create_user('admin@madrid.es', 'admin') +admin = create_user('admin@consul.dev', 'admin') admin.create_administrator -moderator = create_user('mod@madrid.es', 'mod') +moderator = create_user('mod@consul.dev', 'mod') moderator.create_moderator -valuator = create_user('valuator@madrid.es', 'valuator') +valuator = create_user('valuator@consul.dev', 'valuator') valuator.create_valuator -level_2 = create_user('leveltwo@madrid.es', 'level 2') +level_2 = create_user('leveltwo@consul.dev', 'level 2') level_2.update(residence_verified_at: Time.now, confirmed_phone: Faker::PhoneNumber.phone_number, document_number: "2222222222", document_type: "1" ) -verified = create_user('verified@madrid.es', 'verified') +verified = create_user('verified@consul.dev', 'verified') verified.update(residence_verified_at: Time.now, confirmed_phone: Faker::PhoneNumber.phone_number, document_type: "1", verified_at: Time.now, document_number: "3333333333") (1..10).each do |i| org_name = Faker::Company.name - org_user = create_user("org#{i}@madrid.es", org_name) + org_user = create_user("org#{i}@consul.dev", org_name) org_responsible_name = Faker::Name.name org = org_user.create_organization(name: org_name, responsible_name: org_responsible_name) @@ -73,12 +73,12 @@ verified.update(residence_verified_at: Time.now, confirmed_phone: Faker::PhoneNu end (1..5).each do |i| - official = create_user("official#{i}@madrid.es") + official = create_user("official#{i}@consul.dev") official.update(official_level: i, official_position: "Official position #{i}") end (1..40).each do |i| - user = create_user("user#{i}@madrid.es") + user = create_user("user#{i}@consul.dev") level = [1,2,3].sample if level >= 2 then user.update(residence_verified_at: Time.now, confirmed_phone: Faker::PhoneNumber.phone_number, document_number: Faker::Number.number(10), document_type: "1" ) diff --git a/db/seeds.rb b/db/seeds.rb index 86847a64e..939a5f045 100644 --- a/db/seeds.rb +++ b/db/seeds.rb @@ -1,7 +1,7 @@ # coding: utf-8 # Default admin user (change password after first deploy to a server!) if Administrator.count == 0 && !Rails.env.test? - admin = User.create!(username: 'admin', email: 'admin@madrid.es', password: '12345678', password_confirmation: '12345678', confirmed_at: Time.now, terms_of_service: "1") + admin = User.create!(username: 'admin', email: 'admin@consul.dev', password: '12345678', password_confirmation: '12345678', confirmed_at: Time.now, terms_of_service: "1") admin.create_administrator end diff --git a/doc/locales/fr.yaml b/doc/locales/fr.yaml index e3298cb1f..399a4e60c 100644 --- a/doc/locales/fr.yaml +++ b/doc/locales/fr.yaml @@ -1209,7 +1209,7 @@ fr: et plus riche quand c'est libérée.\r\n\r\nNon seulement vous pouvez utiliser ce portail pour votre propre collectivité, mais vous serez aussi aidé par la Mairie de Madrid autant que possible pour le faire. Si vous êtes intéressé, - n'hésitez pas à nous contacter : ag.gobiernoabierto@madrid.es\r\n\r\nSi + n'hésitez pas à nous contacter : ag.gobiernoabierto@consul.dev\r\n\r\nSi vous êtes développeur, vous pouvez voir le code et nous aider à l'améliorer sur [Consul app](https://github.com/ayuntamientomadrid 'consul github ' )." diff --git a/doc/locales/pt-br.yaml b/doc/locales/pt-br.yaml index 9098a933e..9d2b3ee46 100644 --- a/doc/locales/pt-br.yaml +++ b/doc/locales/pt-br.yaml @@ -1228,8 +1228,8 @@ pt-BR: compartilhada.\r\n\r\nNão somente você pode usar livremente este portal no governo local, mas você também será ajudado pelo conselho da cidade de Madrid, o tanto quanto possível para fazê-lo, por isso, se você estiver - interessado escreva-nos: ag.gobiernoabierto@madrid.es \r\n\r\nSe você é um programador, você + interessado escreva-nos: ag.gobiernoabierto@consul.dev \r\n\r\nSe você é um programador, você pode ver o código e nos ajudar a melhorá-lo em [app Consul] (https://github.com/ayuntamientomadrid 'cônsul github')." titles: diff --git a/spec/factories.rb b/spec/factories.rb index 209f45b28..cdcfe7381 100644 --- a/spec/factories.rb +++ b/spec/factories.rb @@ -3,7 +3,7 @@ FactoryGirl.define do factory :user do sequence(:username) { |n| "Manuela#{n}" } - sequence(:email) { |n| "manuela#{n}@madrid.es" } + sequence(:email) { |n| "manuela#{n}@consul.dev" } password 'judgmentday' terms_of_service '1' @@ -78,7 +78,7 @@ FactoryGirl.define do factory :verification_letter, class: Verification::Letter do user - email 'user@madrid.es' + email 'user@consul.dev' password '1234' verification_code '5555' end diff --git a/spec/features/emails_spec.rb b/spec/features/emails_spec.rb index ac1249fd6..429d74738 100644 --- a/spec/features/emails_spec.rb +++ b/spec/features/emails_spec.rb @@ -11,7 +11,7 @@ feature 'Emails' do email = open_last_email expect(email).to have_subject('Confirmation instructions') - expect(email).to deliver_to('manuela@madrid.es') + expect(email).to deliver_to('manuela@consul.dev') expect(email).to have_body_text(user_confirmation_path) end @@ -20,7 +20,7 @@ feature 'Emails' do email = open_last_email expect(email).to have_subject('Instructions for resetting your password') - expect(email).to deliver_to('manuela@madrid.es') + expect(email).to deliver_to('manuela@consul.dev') expect(email).to have_body_text(edit_user_password_path) end @@ -118,7 +118,7 @@ feature 'Emails' do email = open_last_email expect(email).to have_subject('Confirmation instructions') - expect(email).to deliver_to('manuela@madrid.es') + expect(email).to deliver_to('manuela@consul.dev') expect(email).to have_body_text(user_confirmation_path) end diff --git a/spec/features/registration_form_spec.rb b/spec/features/registration_form_spec.rb index 4f258e601..81b9d9bec 100644 --- a/spec/features/registration_form_spec.rb +++ b/spec/features/registration_form_spec.rb @@ -28,7 +28,7 @@ feature 'Registration form' do visit new_user_registration_path(use_redeemable_code: 'true') fill_in 'user_username', with: "NewUserWithCode77" - fill_in 'user_email', with: "new@madrid.es" + fill_in 'user_email', with: "new@consul.dev" fill_in 'user_password', with: "password" fill_in 'user_password_confirmation', with: "password" fill_in 'user_redeemable_code', with: " " diff --git a/spec/features/users_auth_spec.rb b/spec/features/users_auth_spec.rb index bd93a04f8..9e1e67ef9 100644 --- a/spec/features/users_auth_spec.rb +++ b/spec/features/users_auth_spec.rb @@ -8,7 +8,7 @@ feature 'Users' do click_link 'Register' fill_in 'user_username', with: 'Manuela Carmena' - fill_in 'user_email', with: 'manuela@madrid.es' + fill_in 'user_email', with: 'manuela@consul.dev' fill_in 'user_password', with: 'judgementday' fill_in 'user_password_confirmation', with: 'judgementday' check 'user_terms_of_service' @@ -31,11 +31,11 @@ feature 'Users' do end scenario 'Sign in' do - create(:user, email: 'manuela@madrid.es', password: 'judgementday') + create(:user, email: 'manuela@consul.dev', password: 'judgementday') visit '/' click_link 'Sign in' - fill_in 'user_email', with: 'manuela@madrid.es' + fill_in 'user_email', with: 'manuela@consul.dev' fill_in 'user_password', with: 'judgementday' click_button 'Enter' @@ -140,7 +140,7 @@ feature 'Users' do end scenario 'Sign in, user was already signed up with OAuth' do - user = create(:user, email: 'manuela@madrid.es', password: 'judgementday') + user = create(:user, email: 'manuela@consul.dev', password: 'judgementday') create(:identity, uid: '12345', provider: 'twitter', user: user) OmniAuth.config.add_mock(:twitter, twitter_hash) @@ -159,7 +159,7 @@ feature 'Users' do end scenario 'Try to register with the username of an already existing user' do - create(:user, username: 'manuela', email: 'manuela@madrid.es', password: 'judgementday') + create(:user, username: 'manuela', email: 'manuela@consul.dev', password: 'judgementday') OmniAuth.config.add_mock(:twitter, twitter_hash_with_verified_email) visit '/' @@ -265,13 +265,13 @@ feature 'Users' do end scenario 'Reset password' do - create(:user, email: 'manuela@madrid.es') + create(:user, email: 'manuela@consul.dev') visit '/' click_link 'Sign in' click_link 'Forgotten your password?' - fill_in 'user_email', with: 'manuela@madrid.es' + fill_in 'user_email', with: 'manuela@consul.dev' click_button 'Send instructions' expect(page).to have_content "In a few minutes, you will receive an email containing instructions on resetting your password." diff --git a/spec/models/user_spec.rb b/spec/models/user_spec.rb index c56e7a115..d54f3a42e 100644 --- a/spec/models/user_spec.rb +++ b/spec/models/user_spec.rb @@ -327,9 +327,9 @@ describe User do describe "self.search" do it "find users by email" do - user1 = create(:user, email: "larry@madrid.es") - create(:user, email: "bird@madrid.es") - search = User.search("larry@madrid.es") + user1 = create(:user, email: "larry@consul.dev") + create(:user, email: "bird@consul.dev") + search = User.search("larry@consul.dev") expect(search.size).to eq(1) expect(search.first).to eq(user1) end diff --git a/spec/support/common_actions.rb b/spec/support/common_actions.rb index ca5c7b64a..60d6641bf 100644 --- a/spec/support/common_actions.rb +++ b/spec/support/common_actions.rb @@ -1,6 +1,6 @@ module CommonActions - def sign_up(email='manuela@madrid.es', password='judgementday') + def sign_up(email='manuela@consul.dev', password='judgementday') visit '/' click_link 'Register' @@ -51,13 +51,13 @@ module CommonActions end def reset_password - create(:user, email: 'manuela@madrid.es') + create(:user, email: 'manuela@consul.dev') visit '/' click_link 'Sign in' click_link 'Forgotten your password?' - fill_in 'user_email', with: 'manuela@madrid.es' + fill_in 'user_email', with: 'manuela@consul.dev' click_button 'Send instructions' end From e8b73947ef017e724ad1e0da37ffbd89eceb58e4 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Andr=C3=A9s=20Pereira?= Date: Thu, 14 Jul 2016 18:18:15 +0200 Subject: [PATCH 119/126] Adding initial documentation for users and panels for special users --- doc/README.md | 147 ++++++++++++++++++++++++++++++ doc/imgs/panel_administration.png | Bin 0 -> 86512 bytes doc/imgs/panel_management.png | Bin 0 -> 42996 bytes doc/imgs/panel_moderation.png | Bin 0 -> 39518 bytes doc/imgs/user_preverification.png | Bin 0 -> 44965 bytes doc/imgs/user_registration.png | Bin 0 -> 77382 bytes doc/imgs/user_verification.png | Bin 0 -> 52853 bytes 7 files changed, 147 insertions(+) create mode 100644 doc/README.md create mode 100644 doc/imgs/panel_administration.png create mode 100644 doc/imgs/panel_management.png create mode 100644 doc/imgs/panel_moderation.png create mode 100644 doc/imgs/user_preverification.png create mode 100644 doc/imgs/user_registration.png create mode 100644 doc/imgs/user_verification.png diff --git a/doc/README.md b/doc/README.md new file mode 100644 index 000000000..cfbfaaf66 --- /dev/null +++ b/doc/README.md @@ -0,0 +1,147 @@ +h1. Funcionalidades + +Actualmente Consul soporta: + +* Registro y verificación de usuarios tanto en la misma aplicación como con distintos proveedores (Twitter, Facebook, Google) +* Distintos perfiles de usuario, tanto ciudadanos individuales como organizaciones. +* Distintos perfiles de administración, gestión y moderación. +* Espacio permanente de debates y propuestas. +* Comentarios anidados en debates y propuestas. +* Presupuestos participativos a través de distintas fases. + +h1. Usuario + +Para registrar un usuario nuevo es posible hacerlo en la propia aplicación, dando un nombre de usuario (Nombre público que aparecerá en tus publicaciones), un correo electrónico y una contraseña con la que se accederá a la web. Se deben aceptar las condiciones de uso. El usuario debe confirmar su correo electrónico para poder iniciar sesión + +![Registro de usuario](doc/imgs/user_registration.png?raw=true "Registro de usuario") + +Por otro lado también se puede habilitar el registro a través de servicios externos como Twitter, Facebook y Google. Para esto hace falta tener la configuración habilitada en Settings y las claves y secretos de estos servicios en el fichero *config/secrets.yml*. + +``` + twitter_key: "" + twitter_secret: "" + facebook_key: "" + facebook_secret: "" + google_oauth2_key: "" + google_oauth2_secret: "" +``` + +Una vez el usuario ha iniciado sesión le aparecerá la posibilidad de verificar su cuenta, a través de una conexión con el padrón municipal. + +![Verificación de usuario](doc/imgs/user_preverification.png?raw=true "Verificación de usuario") + +Para esta funcionalidad hace falta que el padrón municipal soporte la posibilidad de conexión a través de una API, puedes ver un ejemplo en *lib/census_api.rb*. + +![Verificación de usuario](doc/imgs/user_verification.png?raw=true "Verificación de usuario") + +h1. Perfil de usuario + +Dentro de su perfil cada usuario puede configurar si quiere mostrar públicamente su lista de actividades, así como las notificaciones que le enviará la aplicación a través de correo electrónico. Estas notificiaciones pueden ser: + +* Recibir un email cuando alguien comenta en sus propuestas o debates +* Recibir un email cuando alguien contesta a sus comentarios +* Recibir emails con información interesante sobre la web +* Recibir resumen de notificaciones sobre propuestas +* Recibir emails con mensajes privados + +h1. Paneles de administración, gestión y moderación + +Consul cuenta con tres perfiles de usuario diferenciados para hacer tareas de revisión y moderación de los contenidos. Se detallan a continuación: + +h2. Administración + +![Panel de administración](doc/imgs/panel_administration.png?raw=true "Panel de administración") + +Desde aquí puedes administrar el sistema, a través de las siguientes acciones: + +h3. Temas de debate + +Los temas (también llamadas tags, o etiquetas) de debate son palabras que definen los usuarios al crear debates, para catalogarlos (ej: sanidad, movilidad, arganzuela, ...). Aquí se pueden eliminar temas inapropiados, o marcarlos para ser propuestos al crear debates (cada usuario puede definir los que quiera, pero se le sugieren algunos que nos parecen útiles como catalogación por defecto; aquí se puede cambiar cuáles se sugieren) + +h3. Propuestas/Debates/Comentarios ocultos + +Cuando un moderador o un administrador oculta una Propuesta/Debate/Comentario aparecerá en esta lista. De esta forma los administradores pueden revisar que se ha ocultado el elemento adecuado. +* Al pulsar Confirmar se acepta el que se haya ocultado, se considera que se ha hecho correctamente. +* Al pulsar Volver a mostrar se revierte la acción de ocultar y vuelve a ser una Propuesta/Debate/Comentario visible, en el caso de que se considere que ha sido una acción errónea el haberlo ocultado. +Para facilitar la gestión, arriba encontramos un filtro con las secciones: "pendientes" (los elementos sobre los que todavía no se ha pulsado "confirmar" o "volver a mostrar", que deberían ser revisados todavía), "confirmados" y "todos". + +Es recomendable revisar regularmente la sección "pendientes". + +h3. Usuarios bloqueados + +Cuando un moderador o un administrador bloquea a un usuario aparecerá en esta lista. Al bloquear a un usuario, éste deja de poder utilizarlo para ninguna acción de la web. Los administradores pueden desbloquearlos pulsando el botón al lado del nombre del usuario en la lista. + +h3. Organizaciones + +En la web hay dos tipos de usuarios: individuales y organizaciones. Cualquier persona puede crear usuarios de un tipo o de otro en la propia web. Los usuarios de organizaciones pueden ser verificados por parte de los administradores, confirmando que quien gestiona el usuario efectivamente representa a esa organización. Una vez se haya realizado el proceso de verificación, por el proceso externo a la web que se haya definido para ello, se pulsa el botón "Verificar" para confimarlo; lo que hará que al lado del nombre de la organización aparezca una etiqueta señalando que es una organización verificada. + +En caso de que el proceso de verificación haya sido negativo, se pulsa el botón "Rechazar". Para editar alguno de los datos de la organización, se pulsa el botón "Editar". + +En caso de que el proceso de verificación haya sido negativo, se pulsa el botón "Rechazar". Para editar alguno de los datos de la organización, se pulsa el botón "Editar". + +Las organizaciones que no aparecen en la lista pueden ser encontradas para actuar sobre ellas por medio del buscador en la parte superior. Para facilitar la gestión, arriba encontramos un filtro con las secciones: "pendientes" (las organizaciones que todavía no han sido verificadas o rechazadas), "verificadas", "rechazadas" y "todas". + +Es recomendable revisar regularmente la sección "pendientes". + +h3. Cargos Públicos + +En la web, los usuarios individuales pueden ser usuarios normales, o cargos públicos. Estos últimos se diferencian de los primeros únicamente en que al lado de sus nombres aparece una etiqueta que les identifica, y cambia ligeramente el estilo de sus comentarios. Esto permite que los usuarios les identifiquen más fácilmente. Al lado de cada usuario vemos la identificación que aparece en su etiqueta, y su nivel (la manera que internamente usa la web para diferenciar entre un tipo de cargos y otros). Pulsando el botón "Editar" al lado del usuario, se puede modificar su información. Los cargos públicos que no aparecen en la lista pueden ser encontrados para actuar sobre ellos por medio del buscador en la parte superior. + +h3. Moderadores + +Mediante el buscador de la parte superior se pueden buscar usuarios, para activarlos o desactivarlos como moderadores de la web. Los moderadores al acceder a la web con su usuario ven en la parte superior una nueva sección llamada "Moderar" + +h3. Actividad de moderadores + +En esta sección se va guardando todas las acciones que realizan los moderadores o los administradores respecto a la moderación: ocultar/mostrar Propuestas/Debates/Comentarios y bloquear usuarios. En la columna "Acción" comprobamos si la acción corresponde con ocultar o con volver a mostrar (restaurar) elementos o con bloquear usuarios. En las demás columnas tenemos el tipo de elemento, el contenido del elemento y el moderador o administrador que ha realizado la acción. Esta sección permite que los administradores detecten comportamientos irregulares por parte de moderadores específicos y que por lo tanto puedan corregirlos. + +h3. Configuración Global + +Opciones generales de configuración del sistema. + +h3. Estadísticas + +Estadísticas generales del sistema. + +h2. Moderación + +![Panel de moderación](doc/imgs/panel_moderation.png?raw=true "Panel de moderación") + +Desde aquí puedes moderar el sistema, a través de las siguientes acciones: + +h3. Propuestas / Debates / Comentarios + +Cuando un usuario marca en una Propuesta/Debate/Comentario la opción de "denunciar como inapropiado", aparecerá en esta lista. Respecto a cada uno aparecerá el título, fecha, número de denuncias (cuántos usuarios diferentes han marcado la opción de denuncia) y el texto de la Propuesta/Debate/Comentario. + +A la derecha de cada elemento aparece una caja que podemos marcar para seleccionar todos los que queramos de la lista. Una vez seleccionados uno o varios, encontramos al final de la página tres botones para realizar acciones sobre ellos: + +* Ocultar: hará que esos elementos dejen de mostrarse en la web. +* Bloquear autores: hará que el autor de ese elemento deje de poder acceder a la web, y que además todos las Propuestas/Debates/Comentarios de ese usuario dejen de mostrarse en la web. +* Marcar como revisados cuando consideramos que esos elementos no deben ser moderados, que su contenido es correcto, y que por lo tanto deben dejar de ser mostrados en esta lista de elementos inapropiados. + +Para facilitar la gestión, arriba encontramos un filtro con las secciones: +Pendientes: las Propuestas/Debates/Comentarios sobre los que todavía no se ha pulsado "ocultar", "bloquear" o "marcar como revisados", y que por lo tanto deberían ser revisados todavía +Todos: mostrando todos las Propuestas/Debates/Comentarios de la web, y no sólo los marcados como inapropiados. +Marcados como revisados: los que algún moderador ha marcado como revisados y por lo tanto parecen correctos. + +Es recomendable revisar regularmente la sección "pendientes". + +h3. Bloquear usuarios + +Un buscador nos permite encontrar cualquier usuario introduciendo su nombre de usuario o correo electrónico, y bloquearlo una vez encontrado. Al bloquearlo, el usuario no podrá volver a acceder a la web, y todas sus Propuestas/Debates/Comentarios serán ocultados y dejarán de ser visibles en la web. + +h2. Gestión + +![Panel de gestión](doc/imgs/panel_management.png?raw=true "Panel de gestión") + +Desde aquí puedes gestionar usuarios a través de las siguientes acciones: + +* Usuarios +* Editar cuenta de usuario +* Crear propuesta +* Apoyar propuestas +* Crear propuesta de inversión +* Apoyar propts. de inversión +* Imprimir propuestas +* Imprimir propts. de inversión +* Invitaciones para usuarios diff --git a/doc/imgs/panel_administration.png b/doc/imgs/panel_administration.png new file mode 100644 index 0000000000000000000000000000000000000000..cdb89caebe747f53d8f8b68ebdd59c5fa021ab7c GIT binary patch literal 86512 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

  • PMnLtvi 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 VYiOnv%!Ua>z)?Tcc%J#&KLDVWoF@PP literal 0 HcmV?d00001 diff --git a/doc/imgs/panel_moderation.png b/doc/imgs/panel_moderation.png new file mode 100644 index 0000000000000000000000000000000000000000..11fa4f7590a6517239d2320a2e44d85c162b2f32 GIT binary patch literal 39518 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 Sa$<9PWqv-;3k}}a?)(Z6x^!&- literal 0 HcmV?d00001 diff --git a/doc/imgs/user_preverification.png b/doc/imgs/user_preverification.png new file mode 100644 index 0000000000000000000000000000000000000000..d6330637afdcdb42198ef5ebdbad5963be0a7f26 GIT binary patch literal 44965 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%0Dq;?vg!1FGL8G>DD@T`T(wQv}r^V-Btry4RYTz&b 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 literal 0 HcmV?d00001 diff --git a/doc/imgs/user_verification.png b/doc/imgs/user_verification.png new file mode 100644 index 0000000000000000000000000000000000000000..ddfaa27fded233df23359d39af9b83007500469f GIT binary patch literal 52853 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%0A0FO8>%!8lFi9d9uNjxziv94<# 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 Date: Thu, 14 Jul 2016 18:25:25 +0200 Subject: [PATCH 120/126] Fixing docs Markdown format and images routes --- doc/README.md | 48 ++++++++++++++++++++++++------------------------ 1 file changed, 24 insertions(+), 24 deletions(-) diff --git a/doc/README.md b/doc/README.md index cfbfaaf66..89e43aad5 100644 --- a/doc/README.md +++ b/doc/README.md @@ -1,4 +1,4 @@ -h1. Funcionalidades +# Funcionalidades Actualmente Consul soporta: @@ -9,11 +9,11 @@ Actualmente Consul soporta: * Comentarios anidados en debates y propuestas. * Presupuestos participativos a través de distintas fases. -h1. Usuario +# Usuario Para registrar un usuario nuevo es posible hacerlo en la propia aplicación, dando un nombre de usuario (Nombre público que aparecerá en tus publicaciones), un correo electrónico y una contraseña con la que se accederá a la web. Se deben aceptar las condiciones de uso. El usuario debe confirmar su correo electrónico para poder iniciar sesión -![Registro de usuario](doc/imgs/user_registration.png?raw=true "Registro de usuario") +![Registro de usuario](imgs/user_registration.png "Registro de usuario") Por otro lado también se puede habilitar el registro a través de servicios externos como Twitter, Facebook y Google. Para esto hace falta tener la configuración habilitada en Settings y las claves y secretos de estos servicios en el fichero *config/secrets.yml*. @@ -28,13 +28,13 @@ Por otro lado también se puede habilitar el registro a través de servicios ext Una vez el usuario ha iniciado sesión le aparecerá la posibilidad de verificar su cuenta, a través de una conexión con el padrón municipal. -![Verificación de usuario](doc/imgs/user_preverification.png?raw=true "Verificación de usuario") +![Verificación de usuario](imgs/user_preverification.png?raw=true "Verificación de usuario") Para esta funcionalidad hace falta que el padrón municipal soporte la posibilidad de conexión a través de una API, puedes ver un ejemplo en *lib/census_api.rb*. -![Verificación de usuario](doc/imgs/user_verification.png?raw=true "Verificación de usuario") +![Verificación de usuario](imgs/user_verification.png?raw=true "Verificación de usuario") -h1. Perfil de usuario +# Perfil de usuario Dentro de su perfil cada usuario puede configurar si quiere mostrar públicamente su lista de actividades, así como las notificaciones que le enviará la aplicación a través de correo electrónico. Estas notificiaciones pueden ser: @@ -44,21 +44,21 @@ Dentro de su perfil cada usuario puede configurar si quiere mostrar públicament * Recibir resumen de notificaciones sobre propuestas * Recibir emails con mensajes privados -h1. Paneles de administración, gestión y moderación +# Paneles de administración, gestión y moderación Consul cuenta con tres perfiles de usuario diferenciados para hacer tareas de revisión y moderación de los contenidos. Se detallan a continuación: -h2. Administración +## Administración -![Panel de administración](doc/imgs/panel_administration.png?raw=true "Panel de administración") +![Panel de administración](imgs/panel_administration.png?raw=true "Panel de administración") Desde aquí puedes administrar el sistema, a través de las siguientes acciones: -h3. Temas de debate +### Temas de debate Los temas (también llamadas tags, o etiquetas) de debate son palabras que definen los usuarios al crear debates, para catalogarlos (ej: sanidad, movilidad, arganzuela, ...). Aquí se pueden eliminar temas inapropiados, o marcarlos para ser propuestos al crear debates (cada usuario puede definir los que quiera, pero se le sugieren algunos que nos parecen útiles como catalogación por defecto; aquí se puede cambiar cuáles se sugieren) -h3. Propuestas/Debates/Comentarios ocultos +### Propuestas/Debates/Comentarios ocultos Cuando un moderador o un administrador oculta una Propuesta/Debate/Comentario aparecerá en esta lista. De esta forma los administradores pueden revisar que se ha ocultado el elemento adecuado. * Al pulsar Confirmar se acepta el que se haya ocultado, se considera que se ha hecho correctamente. @@ -67,11 +67,11 @@ Para facilitar la gestión, arriba encontramos un filtro con las secciones: "pen Es recomendable revisar regularmente la sección "pendientes". -h3. Usuarios bloqueados +### Usuarios bloqueados Cuando un moderador o un administrador bloquea a un usuario aparecerá en esta lista. Al bloquear a un usuario, éste deja de poder utilizarlo para ninguna acción de la web. Los administradores pueden desbloquearlos pulsando el botón al lado del nombre del usuario en la lista. -h3. Organizaciones +### Organizaciones En la web hay dos tipos de usuarios: individuales y organizaciones. Cualquier persona puede crear usuarios de un tipo o de otro en la propia web. Los usuarios de organizaciones pueden ser verificados por parte de los administradores, confirmando que quien gestiona el usuario efectivamente representa a esa organización. Una vez se haya realizado el proceso de verificación, por el proceso externo a la web que se haya definido para ello, se pulsa el botón "Verificar" para confimarlo; lo que hará que al lado del nombre de la organización aparezca una etiqueta señalando que es una organización verificada. @@ -83,33 +83,33 @@ Las organizaciones que no aparecen en la lista pueden ser encontradas para actua Es recomendable revisar regularmente la sección "pendientes". -h3. Cargos Públicos +### Cargos Públicos En la web, los usuarios individuales pueden ser usuarios normales, o cargos públicos. Estos últimos se diferencian de los primeros únicamente en que al lado de sus nombres aparece una etiqueta que les identifica, y cambia ligeramente el estilo de sus comentarios. Esto permite que los usuarios les identifiquen más fácilmente. Al lado de cada usuario vemos la identificación que aparece en su etiqueta, y su nivel (la manera que internamente usa la web para diferenciar entre un tipo de cargos y otros). Pulsando el botón "Editar" al lado del usuario, se puede modificar su información. Los cargos públicos que no aparecen en la lista pueden ser encontrados para actuar sobre ellos por medio del buscador en la parte superior. -h3. Moderadores +### Moderadores Mediante el buscador de la parte superior se pueden buscar usuarios, para activarlos o desactivarlos como moderadores de la web. Los moderadores al acceder a la web con su usuario ven en la parte superior una nueva sección llamada "Moderar" -h3. Actividad de moderadores +### Actividad de moderadores En esta sección se va guardando todas las acciones que realizan los moderadores o los administradores respecto a la moderación: ocultar/mostrar Propuestas/Debates/Comentarios y bloquear usuarios. En la columna "Acción" comprobamos si la acción corresponde con ocultar o con volver a mostrar (restaurar) elementos o con bloquear usuarios. En las demás columnas tenemos el tipo de elemento, el contenido del elemento y el moderador o administrador que ha realizado la acción. Esta sección permite que los administradores detecten comportamientos irregulares por parte de moderadores específicos y que por lo tanto puedan corregirlos. -h3. Configuración Global +### Configuración Global Opciones generales de configuración del sistema. -h3. Estadísticas +### Estadísticas Estadísticas generales del sistema. -h2. Moderación +## Moderación -![Panel de moderación](doc/imgs/panel_moderation.png?raw=true "Panel de moderación") +![Panel de moderación](imgs/panel_moderation.png?raw=true "Panel de moderación") Desde aquí puedes moderar el sistema, a través de las siguientes acciones: -h3. Propuestas / Debates / Comentarios +### Propuestas / Debates / Comentarios Cuando un usuario marca en una Propuesta/Debate/Comentario la opción de "denunciar como inapropiado", aparecerá en esta lista. Respecto a cada uno aparecerá el título, fecha, número de denuncias (cuántos usuarios diferentes han marcado la opción de denuncia) y el texto de la Propuesta/Debate/Comentario. @@ -126,13 +126,13 @@ Marcados como revisados: los que algún moderador ha marcado como revisados y po Es recomendable revisar regularmente la sección "pendientes". -h3. Bloquear usuarios +### Bloquear usuarios Un buscador nos permite encontrar cualquier usuario introduciendo su nombre de usuario o correo electrónico, y bloquearlo una vez encontrado. Al bloquearlo, el usuario no podrá volver a acceder a la web, y todas sus Propuestas/Debates/Comentarios serán ocultados y dejarán de ser visibles en la web. -h2. Gestión +## Gestión -![Panel de gestión](doc/imgs/panel_management.png?raw=true "Panel de gestión") +![Panel de gestión](imgs/panel_management.png?raw=true "Panel de gestión") Desde aquí puedes gestionar usuarios a través de las siguientes acciones: From 1946fa242fe30107fe7e1c037ef3619a9c6d21bc Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Juanjo=20Baz=C3=A1n?= Date: Mon, 18 Jul 2016 14:37:16 +0200 Subject: [PATCH 121/126] updates dependencies fuubar, groupdate --- Gemfile.lock | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/Gemfile.lock b/Gemfile.lock index 9df1a9826..ee114cd23 100644 --- a/Gemfile.lock +++ b/Gemfile.lock @@ -170,13 +170,13 @@ GEM activesupport (>= 4.1) railties (>= 4.1) tzinfo (~> 1.2, >= 1.2.2) - fuubar (2.0.0) + fuubar (2.1.1) rspec (~> 3.0) ruby-progressbar (~> 1.4) geocoder (1.3.7) globalid (0.3.6) activesupport (>= 4.1.0) - groupdate (3.0.0) + groupdate (3.0.1) activesupport (>= 3) gyoku (1.3.1) builder (>= 2.1.2) @@ -345,7 +345,7 @@ GEM rspec-mocks (~> 3.5.0) rspec-support (~> 3.5.0) rspec-support (3.5.0) - ruby-progressbar (1.7.5) + ruby-progressbar (1.8.1) safe_yaml (1.0.4) safely_block (0.1.1) errbase From 0772c8a5cace410ab4d4769bde35a39bf6cc5582 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Juanjo=20Baz=C3=A1n?= Date: Mon, 18 Jul 2016 14:49:56 +0200 Subject: [PATCH 122/126] updates ckeditor version --- Gemfile | 2 +- Gemfile.lock | 4 ++-- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/Gemfile b/Gemfile index 7c5711a18..2ea2eb5c4 100644 --- a/Gemfile +++ b/Gemfile @@ -34,7 +34,7 @@ gem 'responders' gem 'foundation-rails' gem 'foundation_rails_helper' gem 'acts_as_votable' -gem 'ckeditor', '~> 4.1.5' +gem 'ckeditor', '~> 4.2.0' gem 'invisible_captcha', '~> 0.9.1' gem 'cancancan' gem 'social-share-button' diff --git a/Gemfile.lock b/Gemfile.lock index ee114cd23..ad24ae9ec 100644 --- a/Gemfile.lock +++ b/Gemfile.lock @@ -98,7 +98,7 @@ GEM rack-test (>= 0.5.4) xpath (~> 2.0) chronic (0.10.2) - ckeditor (4.1.6) + ckeditor (4.2.0) cocaine orm_adapter (~> 0.5.0) climate_control (0.0.3) @@ -451,7 +451,7 @@ DEPENDENCIES capistrano-rvm capistrano3-delayed-job (~> 1.0) capybara - ckeditor (~> 4.1.5) + ckeditor (~> 4.2.0) coffee-rails (~> 4.2.1) coveralls daemons From dc7ee4576650749c2f88093853d675e67e7482a2 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Juanjo=20Baz=C3=A1n?= Date: Mon, 18 Jul 2016 14:50:28 +0200 Subject: [PATCH 123/126] uses before_action instead of before_filter before_filter is deprecated --- app/controllers/concerns/feature_flags.rb | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/app/controllers/concerns/feature_flags.rb b/app/controllers/concerns/feature_flags.rb index 9c96db96e..ca3cd929e 100644 --- a/app/controllers/concerns/feature_flags.rb +++ b/app/controllers/concerns/feature_flags.rb @@ -3,7 +3,7 @@ module FeatureFlags class_methods do def feature_flag(name, *options) - before_filter(*options) do + before_action(*options) do check_feature_flag(name) end end From 132e7d720f72f280eba064928514bfb3f5cb0e0f Mon Sep 17 00:00:00 2001 From: rgarcia Date: Tue, 19 Jul 2016 11:44:16 +0200 Subject: [PATCH 124/126] updates test coverage badge --- README.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/README.md b/README.md index 18fbc4881..15ac94b1e 100644 --- a/README.md +++ b/README.md @@ -8,7 +8,7 @@ Citizen Participation and Open Government Application [![Build Status](https://travis-ci.org/consul/consul.svg?branch=master)](https://travis-ci.org/consul/consul) [![Code Climate](https://codeclimate.com/github/consul/consul/badges/gpa.svg)](https://codeclimate.com/github/consul/consul) [![Dependency Status](https://gemnasium.com/consul/consul.svg)](https://gemnasium.com/consul/consul) -[![Coverage Status](https://coveralls.io/repos/consul/consul/badge.svg?branch=master&service=github)](https://coveralls.io/github/consul/consul?branch=master) +[![Coverage Status](https://coveralls.io/repos/github/consul/consul/badge.svg?branch=master)](https://coveralls.io/github/consul/consul?branch=master) This is the opensource code repository of the eParticipation website originally developed for the Madrid City government eParticipation website From dee1b4ca0fa1e64af6edff33095e0f8077915743 Mon Sep 17 00:00:00 2001 From: rgarcia Date: Tue, 19 Jul 2016 11:47:19 +0200 Subject: [PATCH 125/126] updates updates test coverage badge for spanish Readme --- README_ES.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/README_ES.md b/README_ES.md index 3120f60a0..5c170a97e 100644 --- a/README_ES.md +++ b/README_ES.md @@ -8,7 +8,7 @@ Aplicación de Participación Ciudadana y Gobierno Abierto [![Build Status](https://travis-ci.org/consul/consul.svg?branch=master)](https://travis-ci.org/consul/consul) [![Code Climate](https://codeclimate.com/github/consul/consul/badges/gpa.svg)](https://codeclimate.com/github/consul/consul) [![Dependency Status](https://gemnasium.com/consul/consul.svg)](https://gemnasium.com/consul/consul) -[![Coverage Status](https://coveralls.io/repos/consul/consul/badge.svg?branch=master&service=github)](https://coveralls.io/github/consul/consul?branch=master) +[![Coverage Status](https://coveralls.io/repos/github/consul/consul/badge.svg?branch=master)](https://coveralls.io/github/consul/consul?branch=master) Este es el repositorio de código abierto de la Aplicación de Participación Ciudadana Consul, creada originariamente por el Ayuntamiento de Madrid. From a3f5b826d848cb7c38fdef27f0a0a82ed51609f7 Mon Sep 17 00:00:00 2001 From: rgarcia Date: Tue, 19 Jul 2016 12:27:19 +0200 Subject: [PATCH 126/126] updates Readme with reference to current features in Docs --- README.md | 2 +- README_ES.md | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/README.md b/README.md index 15ac94b1e..7a92401f3 100644 --- a/README.md +++ b/README.md @@ -14,7 +14,7 @@ This is the opensource code repository of the eParticipation website originally ## Current state -Development started on [2015 July 15th](https://github.com/consul/consul/commit/8db36308379accd44b5de4f680a54c41a0cc6fc6). Code was deployed to production on 2015 september 7th to [decide.madrid.es](https://decide.madrid.es). Since then new features are added often. You can take a look at a roadmap and future features in the [open issues list](https://github.com/consul/consul/issues). +Development started on [2015 July 15th](https://github.com/consul/consul/commit/8db36308379accd44b5de4f680a54c41a0cc6fc6). Code was deployed to production on 2015 september 7th to [decide.madrid.es](https://decide.madrid.es). Since then new features are added often. You can take a look at the current features in the [docs](https://github.com/consul/consul/tree/master/doc) and future features in the [open issues list](https://github.com/consul/consul/issues). ## Tech stack diff --git a/README_ES.md b/README_ES.md index 5c170a97e..489412299 100644 --- a/README_ES.md +++ b/README_ES.md @@ -14,7 +14,7 @@ Este es el repositorio de código abierto de la Aplicación de Participación Ci ## Estado del proyecto -El desarrollo de esta aplicación comenzó el [15 de Julio de 2015](https://github.com/consul/consul/commit/8db36308379accd44b5de4f680a54c41a0cc6fc6) y el código fue puesto en producción el día 7 de Septiembre de 2015 en [decide.madrid.es](https://decide.madrid.es). Desde entonces se le añaden mejoras y funcionalidades constantemente. La evolución y futura lista de funcionalidades a implementar se pueden consultar en la lista de [tareas por hacer](https://github.com/consul/consul/issues). +El desarrollo de esta aplicación comenzó el [15 de Julio de 2015](https://github.com/consul/consul/commit/8db36308379accd44b5de4f680a54c41a0cc6fc6) y el código fue puesto en producción el día 7 de Septiembre de 2015 en [decide.madrid.es](https://decide.madrid.es). Desde entonces se le añaden mejoras y funcionalidades constantemente. Las funcionalidades actuales se pueden consultar en la [documentación](https://github.com/consul/consul/tree/master/doc) y las siguientes funcionaliades en la lista de [tareas por hacer](https://github.com/consul/consul/issues). ## Tecnología