diff --git a/app/assets/javascripts/votes.js.coffee b/app/assets/javascripts/votes.js.coffee index b842c3ffc..22f7653b7 100644 --- a/app/assets/javascripts/votes.js.coffee +++ b/app/assets/javascripts/votes.js.coffee @@ -13,4 +13,5 @@ App.Votes = initialize: -> App.Votes.hoverize "div.votes" App.Votes.hoverize "div.supports" + App.Votes.hoverize "div.debate-questions" false diff --git a/app/assets/stylesheets/legislation_process.scss b/app/assets/stylesheets/legislation_process.scss index cf2f40f6d..c178cc36a 100644 --- a/app/assets/stylesheets/legislation_process.scss +++ b/app/assets/stylesheets/legislation_process.scss @@ -296,6 +296,7 @@ } .debate-questions { + position: relative; list-style: none; .control { diff --git a/app/views/legislation/questions/_participation_not_allowed.html.erb b/app/views/legislation/questions/_participation_not_allowed.html.erb new file mode 100644 index 000000000..b330f7fe0 --- /dev/null +++ b/app/views/legislation/questions/_participation_not_allowed.html.erb @@ -0,0 +1,20 @@ +<% if user_signed_in? && current_user.organization? %> + +<% elsif user_signed_in? && current_user.unverified? %> + +<% elsif !user_signed_in? %> + +<% end %> diff --git a/app/views/legislation/questions/show.html.erb b/app/views/legislation/questions/show.html.erb index 41e8f9f96..be8e90445 100644 --- a/app/views/legislation/questions/show.html.erb +++ b/app/views/legislation/questions/show.html.erb @@ -24,6 +24,7 @@

<%= @question.title %>

<%= render 'answer_form', process: @process, question: @question, answer: @answer %> + <%= render 'participation_not_allowed' %>
diff --git a/config/locales/en.yml b/config/locales/en.yml index 0ae22a2d6..2b7c70334 100755 --- a/config/locales/en.yml +++ b/config/locales/en.yml @@ -278,6 +278,13 @@ en: share_facebook: Share on Facebook share_gplus: Share on Google+ title: Collaborative legislation process + participation: + organizations: Organisations are not permitted to participate in the debate + signin: Sign in + signup: Sign up + unauthenticated: You must %{signin} or %{signup} to participate. + verified_only: Only verified users can participate, %{verify_account}. + verify_account: verify your account locale: English notifications: index: diff --git a/config/locales/es.yml b/config/locales/es.yml index 6d1101961..102d7db1b 100755 --- a/config/locales/es.yml +++ b/config/locales/es.yml @@ -278,6 +278,13 @@ es: share_facebook: Compartir en Facebook share_gplus: Compartir en Google+ title: Proceso de legislación colaborativa + participation: + organizations: Las organizaciones no pueden participar en el debate + signin: iniciar sesión + signup: registrarte + unauthenticated: Necesitas %{signin} o %{signup} para participar en el debate. + verified_only: Solo los usuarios verificados pueden participar en el debate, %{verify_account}. + verify_account: verifica tu cuenta locale: Español notifications: index: