Merge branch 'master' into aperez-admin-question-videos

config/deploy-secrets.yml.example

@@ -1,25 +1,28 @@
 staging:
   deploy_to: "/var/www/consul"
   ssh_port: 21
-  server: staging.consul.es
-  user: xxxxx
-  full_app_name: consul
-  server_name: staging.consul.es
-  db_server: postgre.consul.es
+  server: "staging.consul.es"
+  db_server: "postgre.consul.es"
+  user: "xxxxx"
+  server_name: "staging.consul.es"
+  full_app_name: "consul"
 
 preproduction:
   deploy_to: "/var/www/consul"
   ssh_port: 2222
   server1: xxx.xxx.xxx.xxx
   server2: xxx.xxx.xxx.xxx
-  user: xxxxx
-  full_app_name: consul
   db_server: xxx.xxx.xxx.xxx
+  user: xxxxx
+  server_name: pre.consul.es
+  full_app_name: "consul"
 
 production:
   deploy_to: "/var/www/consul"
-  ssh_port: 2222
-  server: xxx.xxx.xxx.xxx
-  user: xxxxx
-  full_app_name: consul
-
+  ssh_port: 22
+  server1: xxx.xxx.xxx.xxx
+  server2: xxx.xxx.xxx.xxx
+  db_server: xxx.xxx.xxx.xxx
+  user: "deploy"
+  server_name: "consul.es"
+  full_app_name: "consul"

config/locales/en/admin.yml

@@ -587,6 +587,13 @@ en:
       new:
         title: "Create Question"
         poll_label: "Poll"
+        form:
+          title: Title
+          description: Description
+      answers:
+        images:
+          add_image: "Add image"
+          save_image: "Save image"
       show:
         proposal: Original proposal
         author: Author
@@ -600,6 +607,8 @@ en:
           description: Description
           videos: Videos
           video_list: Video list (%{count})
+          images: Images
+          images_list: Images list
     answers:
       new:
         title: New answer

config/locales/en/general.yml

@@ -180,6 +180,7 @@ en:
     spending_proposal: Spending proposal
     budget/investment: Investment
     poll/shift: Shift
+    poll/question/answer: Answer
     user: Account
     verification/sms: phone
     signature_sheet: Signature sheet
@@ -466,10 +467,6 @@ en:
       no_geozone_restricted: "All city"
       geozone_restricted: "Districts"
       geozone_info: "Can participate people in the Census of: "
-      can_answer: "You can participate in this poll!"
-      cant_answer: "This poll is not available on your geozone"
-      cant_answer_not_logged_in: "You must sign in or sign up to participate"
-      cant_answer_verify: "You must verify your account in order to answer"
       already_answer: "You already have participated in this poll"
       section_header:
         icon_alt: Voting icon

config/locales/es/admin.yml

@@ -587,6 +587,13 @@ es:
       new:
         title: "Crear pregunta ciudadana"
         poll_label: "Votación"
+        form:
+          title: Título
+          description: Descripción
+      answers:
+        images:
+          add_image: "Añadir imagen"
+          save_image: "Guardar imagen"
       show:
         proposal: Propuesta ciudadana original
         author: Autor
@@ -601,6 +608,8 @@ es:
           description: Descripción
           videos: Vídeos
           video_list: Lista de vídeos (%{count})
+          images: Imágenes
+          images_list: Lista de imágenes
     answers:
       new:
         title: "Nueva respuesta"

config/locales/es/general.yml

@@ -180,6 +180,7 @@ es:
     spending_proposal: la propuesta de gasto
     budget/investment: la propuesta de inversión
     poll/shift: el turno
+    poll/question/answer: la respuesta
     user: la cuenta
     verification/sms: el teléfono
     signature_sheet: la hoja de firmas
@@ -466,10 +467,6 @@ es:
       no_geozone_restricted: "Toda la ciudad"
       geozone_restricted: "Distritos"
       geozone_info: "Pueden participar las personas empadronadas en: "
-      can_answer: "¡Puedes participar en esta votación!"
-      cant_answer: "Esta votación no está disponible en tu zona"
-      cant_answer_not_logged_in: "Necesitas iniciar sesión o registrarte para participar"
-      cant_answer_verify: "Por favor verifica tu cuenta para poder responder"
       already_answer: "Ya has participado en esta votación"
       section_header:
         icon_alt: Icono de Votaciones

config/routes.rb

@@ -301,7 +301,8 @@ Rails.application.routes.draw do
       end
 
       resources :questions, shallow: true do
-        resources :answers, only: [:new, :create], controller: 'questions/answers' do
+        resources :answers, only: [:new, :create], controller: 'questions/answers', shallow: true do
+          resources :images, controller: 'questions/answers/images'
           resources :videos, controller: 'questions/answers/videos'
         end
       end

config/secrets.yml.example

@@ -1,46 +1,74 @@
 default: &default
-  secret_key_base: "56792feef405a59b18ea7db57b4777e855103882b926413d4afdfb8c0ea8aa86ea6649da4e729c5f5ae324c0ab9338f789174cf48c544173bc18fdc3b14262e4"
+  secret_key_base: 56792feef405a59b18ea7db57b4777e855103882b926413d4afdfb8c0ea8aa86ea6649da4e729c5f5ae324c0ab9338f789174cf48c544173bc18fdc3b14262e4
+
+maps: &maps
   map_tiles_provider: "//{s}.tile.openstreetmap.org/{z}/{x}/{y}.png"
   map_tiles_provider_attribution: "&copy; <a href=\"http://osm.org/copyright\">OpenStreetMap</a> contributors"
 
-development:
-  <<: *default
-
-test:
-  <<: *default
-
-staging:
-  server_name: ""
-  <<: *default
-
-production: &production
-  secret_key_base: "817232feef405a59b18ea7db57b4777e855103882b926413d4afdfb8c0ea8aa86ea6649da4e729c5f5ae324c0ab9338f789174cf48c544173bc18fdc3b14262e4"
-
+apis: &apis
   census_api_end_point: ""
   census_api_institution_code: ""
   census_api_portal_name: ""
   census_api_user_code: ""
-
   sms_end_point:  ""
   sms_username: ""
   sms_password: ""
 
+http_basic_auth: &http_basic_auth
+  http_basic_auth: true
+
+
+development:
+  http_basic_username: "dev"
+  http_basic_password: "pass"
+  <<: *default
+
+test:
+  <<: *default
+  <<: *maps
+
+staging:
+  secret_key_base: ""
+  server_name: ""
+  rollbar_server_token: ""
   http_basic_username: ""
   http_basic_password: ""
+  managers_url: ""
+  managers_application_key: ""
+  <<: *default
+  <<: *maps
+  <<: *apis
 
+preproduction:
+  secret_key_base: ""
+  server_name: ""
+  rollbar_server_token: ""
+  http_basic_username: ""
+  http_basic_password: ""
+  managers_url: ""
+  managers_application_key: ""
   twitter_key: ""
   twitter_secret: ""
   facebook_key: ""
   facebook_secret: ""
   google_oauth2_key: ""
   google_oauth2_secret: ""
+  <<: *maps
+  <<: *apis
 
+production:
+  secret_key_base: ""
+  server_name: ""
   rollbar_server_token: ""
-  server_name: ""
-
-  map_tiles_provider: "//{s}.tile.openstreetmap.org/{z}/{x}/{y}.png"
-  map_tiles_provider_attribution: "&copy; <a href=\"http://osm.org/copyright\">OpenStreetMap</a> contributors"
-
-preproduction:
-  server_name: ""
-  <<: *production
+  http_basic_username: ""
+  http_basic_password: ""
+  managers_url: ""
+  managers_application_key: ""
+  twitter_key: ""
+  twitter_secret: ""
+  facebook_key: ""
+  facebook_secret: ""
+  google_oauth2_key: ""
+  google_oauth2_secret: ""
+  <<: *maps
+  <<: *apis