From ff09f27d908b92a24d9cf55d7aae3c3fec54caf9 Mon Sep 17 00:00:00 2001 From: Oriol Gual Date: Tue, 17 Sep 2019 10:50:33 +0200 Subject: [PATCH 1/3] Update nokogiri and devise too fix security alerts --- Gemfile.lock | 72 ++++++++++++++------------- decidim-admin/decidim-admin.gemspec | 2 +- decidim-core/decidim-core.gemspec | 2 +- decidim-dev/decidim-dev.gemspec | 2 +- decidim-generators/Gemfile.lock | 56 ++++++++++----------- decidim-system/decidim-system.gemspec | 2 +- decidim_app-design/Gemfile.lock | 56 ++++++++++----------- 7 files changed, 97 insertions(+), 95 deletions(-) diff --git a/Gemfile.lock b/Gemfile.lock index 812086fe996b..0c1f05936443 100644 --- a/Gemfile.lock +++ b/Gemfile.lock @@ -29,7 +29,7 @@ PATH decidim-admin (0.19.0.dev) active_link_to (~> 1.0) decidim-core (= 0.19.0.dev) - devise (~> 4.6) + devise (~> 4.7) devise-i18n (~> 1.2) devise_invitable (~> 1.7) jquery-rails (~> 4.3) @@ -76,7 +76,7 @@ PATH charlock_holmes (~> 0.7) date_validator (~> 0.9.0) decidim-api (= 0.19.0.dev) - devise (~> 4.6) + devise (~> 4.7) devise-i18n (~> 1.2) doorkeeper (~> 5.1) doorkeeper-i18n (~> 4.0) @@ -111,7 +111,7 @@ PATH rubyzip (~> 1.2, >= 1.2.2) sassc (~> 1.12, >= 1.12.1) sassc-rails (~> 1.3) - social-share-button (~> 1.2) + social-share-button (~> 1.2, >= 1.2.1) spreadsheet (~> 1.2) sprockets-es6 (~> 0.9.2) truncato (~> 0.7) @@ -132,7 +132,7 @@ PATH factory_bot_rails (~> 4.8) i18n-tasks (~> 0.9.18) mdl (~> 0.5.0) - nokogiri (~> 1.10) + nokogiri (>= 1.10.4) puma (~> 3.12) rails-controller-testing (~> 1.0) rspec-cells (~> 0.3.4) @@ -198,7 +198,7 @@ PATH decidim-system (0.19.0.dev) active_link_to (~> 1.0) decidim-core (= 0.19.0.dev) - devise (~> 4.6) + devise (~> 4.7) devise-i18n (~> 1.2) devise_invitable (~> 1.7) jquery-rails (~> 4.3) @@ -272,7 +272,7 @@ GEM execjs (~> 2.0) batch-loader (1.4.1) bcrypt (3.1.13) - better_html (1.0.13) + better_html (1.0.14) actionview (>= 4.0) activesupport (>= 4.0) ast (~> 2.0) @@ -285,7 +285,7 @@ GEM msgpack (~> 1.0) builder (3.2.3) byebug (11.0.1) - capybara (3.24.0) + capybara (3.29.0) addressable mini_mime (>= 0.1.3) nokogiri (~> 1.8) @@ -309,7 +309,7 @@ GEM actionpack (>= 3.0) cells (>= 4.1.6, < 5.0.0) charlock_holmes (0.7.6) - childprocess (1.0.1) + childprocess (2.0.0) rake (< 13.0) coercible (1.0.0) descendants_tracker (~> 0.0.1) @@ -338,13 +338,13 @@ GEM declarative-option (0.1.0) descendants_tracker (0.0.4) thread_safe (~> 0.3, >= 0.3.1) - devise (4.6.2) + devise (4.7.1) bcrypt (~> 3.0) orm_adapter (~> 0.1) - railties (>= 4.1.0, < 6.0) + railties (>= 4.1.0) responders warden (~> 1.2.3) - devise-i18n (1.8.0) + devise-i18n (1.8.2) devise (>= 4.6) devise_invitable (1.7.5) actionmailer (>= 4.1.0) @@ -357,11 +357,11 @@ GEM docile (1.3.2) domain_name (0.5.20190701) unf (>= 0.0.5, < 1.0.0) - doorkeeper (5.1.0) + doorkeeper (5.2.0) railties (>= 5) doorkeeper-i18n (4.0.1) equalizer (0.0.11) - erb_lint (0.0.28) + erb_lint (0.0.29) activesupport better_html (~> 1.0.7) html_tokenizer @@ -404,11 +404,12 @@ GEM railties sprockets-rails graphql (1.9.6) - hashdiff (1.0.0.beta1) + hashdiff (1.0.0) hashie (3.6.0) highline (2.0.2) html_tokenizer (0.0.7) htmlentities (4.3.4) + http-accept (1.7.0) http-cookie (1.0.3) domain_name (~> 0.5) httparty (0.17.0) @@ -430,7 +431,7 @@ GEM ice_cube (~> 0.16) ice_cube (0.16.3) ice_nine (0.11.2) - invisible_captcha (0.12.1) + invisible_captcha (0.12.2) rails (>= 3.2.0) jaro_winkler (1.5.3) jquery-rails (4.3.5) @@ -497,7 +498,7 @@ GEM netrc (0.11.0) nio4r (2.3.1) nobspw (0.6.1) - nokogiri (1.10.3) + nokogiri (1.10.4) mini_portile2 (~> 2.4.0) oauth (0.5.4) oauth2 (1.4.1) @@ -511,10 +512,10 @@ GEM rack (>= 1.6.2, < 3) omniauth-facebook (5.0.0) omniauth-oauth2 (~> 1.2) - omniauth-google-oauth2 (0.7.0) + omniauth-google-oauth2 (0.8.0) jwt (>= 2.0) omniauth (>= 1.1.1) - omniauth-oauth2 (>= 1.5) + omniauth-oauth2 (>= 1.6) omniauth-oauth (1.1.0) oauth omniauth (~> 1.0) @@ -530,11 +531,11 @@ GEM origami (2.1.0) colorize (~> 0.7) orm_adapter (0.5.0) - paper_trail (10.3.0) - activerecord (>= 4.2, < 6.1) + paper_trail (10.3.1) + activerecord (>= 4.2) request_store (~> 1.1) parallel (1.17.0) - parser (2.6.3.0) + parser (2.6.4.1) ast (~> 2.4.0) pg (1.1.4) pg_search (2.3.0) @@ -575,7 +576,7 @@ GEM rails-dom-testing (2.0.3) activesupport (>= 4.2.0) nokogiri (>= 1.6) - rails-html-sanitizer (1.0.4) + rails-html-sanitizer (1.2.0) loofah (~> 2.2, >= 2.2.2) rails-i18n (5.1.3) i18n (>= 0.7, < 2) @@ -587,7 +588,7 @@ GEM rake (>= 0.8.7) thor (>= 0.19.0, < 2.0) rainbow (3.0.0) - rake (12.3.2) + rake (12.3.3) ransack (2.1.1) actionpack (>= 5.0) activerecord (>= 5.0) @@ -604,13 +605,14 @@ GEM wisper (>= 1.6.1) redcarpet (3.5.0) redis (4.1.2) - regexp_parser (1.5.1) + regexp_parser (1.6.0) request_store (1.4.1) rack (>= 1.4) - responders (2.4.1) - actionpack (>= 4.2.0, < 6.0) - railties (>= 4.2.0, < 6.0) - rest-client (2.0.2) + responders (3.0.0) + actionpack (>= 5.0) + railties (>= 5.0) + rest-client (2.1.0) + http-accept (>= 1.7.0, < 2.0) http-cookie (>= 1.0.2, < 2.0) mime-types (>= 1.16, < 4.0) netrc (~> 0.8) @@ -621,7 +623,7 @@ GEM rspec-cells (0.3.4) cells (>= 4.0.0, < 6.0.0) rspec-rails (~> 3.2) - rspec-core (3.8.1) + rspec-core (3.8.2) rspec-support (~> 3.8.0) rspec-expectations (3.8.4) diff-lcs (>= 1.2.0, < 2.0) @@ -653,7 +655,7 @@ GEM rubocop-rails (2.0.1) rack (>= 1.1) rubocop (>= 0.70.0) - rubocop-rspec (1.33.0) + rubocop-rspec (1.35.0) rubocop (>= 0.60.0) ruby-ole (1.2.12.2) ruby-progressbar (1.10.1) @@ -672,15 +674,15 @@ GEM sprockets-rails tilt searchlight (4.1.0) - selenium-webdriver (3.142.3) - childprocess (>= 0.5, < 2.0) + selenium-webdriver (3.142.4) + childprocess (>= 0.5, < 3.0) rubyzip (~> 1.2, >= 1.2.2) - simplecov (0.16.1) + simplecov (0.17.1) docile (~> 1.1) json (>= 1.8, < 3) simplecov-html (~> 0.10.0) simplecov-html (0.10.2) - smart_properties (1.14.0) + smart_properties (1.15.0) social-share-button (1.2.1) coffee-rails spreadsheet (1.2.4) @@ -738,7 +740,7 @@ GEM activemodel (>= 5.0) bindex (>= 0.4.0) railties (>= 5.0) - webmock (3.6.0) + webmock (3.7.4) addressable (>= 2.3.6) crack (>= 0.3.2) hashdiff (>= 0.4.0, < 2.0.0) diff --git a/decidim-admin/decidim-admin.gemspec b/decidim-admin/decidim-admin.gemspec index 11e77883646a..b837ccdf06de 100644 --- a/decidim-admin/decidim-admin.gemspec +++ b/decidim-admin/decidim-admin.gemspec @@ -21,7 +21,7 @@ Gem::Specification.new do |s| s.add_dependency "active_link_to", "~> 1.0" s.add_dependency "decidim-core", Decidim::Admin.version - s.add_dependency "devise", "~> 4.6" + s.add_dependency "devise", "~> 4.7" s.add_dependency "devise-i18n", "~> 1.2" s.add_dependency "devise_invitable", "~> 1.7" s.add_dependency "jquery-rails", "~> 4.3" diff --git a/decidim-core/decidim-core.gemspec b/decidim-core/decidim-core.gemspec index 12bbcaf133f8..8745fb5ab09c 100644 --- a/decidim-core/decidim-core.gemspec +++ b/decidim-core/decidim-core.gemspec @@ -26,7 +26,7 @@ Gem::Specification.new do |s| s.add_dependency "cells-rails", "~> 0.0.9" s.add_dependency "charlock_holmes", "~> 0.7" s.add_dependency "date_validator", "~> 0.9.0" - s.add_dependency "devise", "~> 4.6" + s.add_dependency "devise", "~> 4.7" s.add_dependency "devise-i18n", "~> 1.2" s.add_dependency "doorkeeper", "~> 5.1" s.add_dependency "doorkeeper-i18n", "~> 4.0" diff --git a/decidim-dev/decidim-dev.gemspec b/decidim-dev/decidim-dev.gemspec index d2ef3e690367..d1b72560f8ba 100644 --- a/decidim-dev/decidim-dev.gemspec +++ b/decidim-dev/decidim-dev.gemspec @@ -29,7 +29,7 @@ Gem::Specification.new do |s| s.add_dependency "erb_lint", "~> 0.0.28" s.add_dependency "i18n-tasks", "~> 0.9.18" s.add_dependency "mdl", "~> 0.5.0" - s.add_dependency "nokogiri", "~> 1.10" + s.add_dependency "nokogiri", ">= 1.10.4" s.add_dependency "puma", "~> 3.12" s.add_dependency "rails-controller-testing", "~> 1.0" s.add_dependency "rspec-cells", "~> 0.3.4" diff --git a/decidim-generators/Gemfile.lock b/decidim-generators/Gemfile.lock index d323ae2b41f3..b88a58d858f6 100644 --- a/decidim-generators/Gemfile.lock +++ b/decidim-generators/Gemfile.lock @@ -29,7 +29,7 @@ PATH decidim-admin (0.19.0.dev) active_link_to (~> 1.0) decidim-core (= 0.19.0.dev) - devise (~> 4.6) + devise (~> 4.7) devise-i18n (~> 1.2) devise_invitable (~> 1.7) jquery-rails (~> 4.3) @@ -71,7 +71,7 @@ PATH charlock_holmes (~> 0.7) date_validator (~> 0.9.0) decidim-api (= 0.19.0.dev) - devise (~> 4.6) + devise (~> 4.7) devise-i18n (~> 1.2) doorkeeper (~> 5.1) doorkeeper-i18n (~> 4.0) @@ -127,7 +127,7 @@ PATH factory_bot_rails (~> 4.8) i18n-tasks (~> 0.9.18) mdl (~> 0.5.0) - nokogiri (~> 1.10) + nokogiri (>= 1.10.4) puma (~> 3.12) rails-controller-testing (~> 1.0) rspec-cells (~> 0.3.4) @@ -193,7 +193,7 @@ PATH decidim-system (0.19.0.dev) active_link_to (~> 1.0) decidim-core (= 0.19.0.dev) - devise (~> 4.6) + devise (~> 4.7) devise-i18n (~> 1.2) devise_invitable (~> 1.7) jquery-rails (~> 4.3) @@ -267,7 +267,7 @@ GEM execjs (~> 2.0) batch-loader (1.4.1) bcrypt (3.1.13) - better_html (1.0.13) + better_html (1.0.14) actionview (>= 4.0) activesupport (>= 4.0) ast (~> 2.0) @@ -280,7 +280,7 @@ GEM msgpack (~> 1.0) builder (3.2.3) byebug (11.0.1) - capybara (3.24.0) + capybara (3.29.0) addressable mini_mime (>= 0.1.3) nokogiri (~> 1.8) @@ -304,7 +304,7 @@ GEM actionpack (>= 3.0) cells (>= 4.1.6, < 5.0.0) charlock_holmes (0.7.6) - childprocess (1.0.1) + childprocess (2.0.0) rake (< 13.0) coercible (1.0.0) descendants_tracker (~> 0.0.1) @@ -333,13 +333,13 @@ GEM declarative-option (0.1.0) descendants_tracker (0.0.4) thread_safe (~> 0.3, >= 0.3.1) - devise (4.6.2) + devise (4.7.1) bcrypt (~> 3.0) orm_adapter (~> 0.1) - railties (>= 4.1.0, < 6.0) + railties (>= 4.1.0) responders warden (~> 1.2.3) - devise-i18n (1.8.0) + devise-i18n (1.8.2) devise (>= 4.6) devise_invitable (1.7.5) actionmailer (>= 4.1.0) @@ -352,11 +352,11 @@ GEM docile (1.3.2) domain_name (0.5.20190701) unf (>= 0.0.5, < 1.0.0) - doorkeeper (5.1.0) + doorkeeper (5.2.0) railties (>= 5) doorkeeper-i18n (4.0.1) equalizer (0.0.11) - erb_lint (0.0.28) + erb_lint (0.0.29) activesupport better_html (~> 1.0.7) html_tokenizer @@ -399,7 +399,7 @@ GEM railties sprockets-rails graphql (1.9.6) - hashdiff (0.4.0) + hashdiff (1.0.0) hashie (3.6.0) highline (2.0.2) html_tokenizer (0.0.7) @@ -493,7 +493,7 @@ GEM netrc (0.11.0) nio4r (2.3.1) nobspw (0.6.1) - nokogiri (1.10.3) + nokogiri (1.10.4) mini_portile2 (~> 2.4.0) oauth (0.5.4) oauth2 (1.4.1) @@ -530,7 +530,7 @@ GEM activerecord (>= 4.2) request_store (~> 1.1) parallel (1.17.0) - parser (2.6.3.0) + parser (2.6.4.1) ast (~> 2.4.0) pg (1.1.4) pg_search (2.3.0) @@ -571,7 +571,7 @@ GEM rails-dom-testing (2.0.3) activesupport (>= 4.2.0) nokogiri (>= 1.6) - rails-html-sanitizer (1.0.4) + rails-html-sanitizer (1.2.0) loofah (~> 2.2, >= 2.2.2) rails-i18n (5.1.3) i18n (>= 0.7, < 2) @@ -583,7 +583,7 @@ GEM rake (>= 0.8.7) thor (>= 0.19.0, < 2.0) rainbow (3.0.0) - rake (12.3.2) + rake (12.3.3) ransack (2.1.1) actionpack (>= 5.0) activerecord (>= 5.0) @@ -600,12 +600,12 @@ GEM wisper (>= 1.6.1) redcarpet (3.5.0) redis (4.1.2) - regexp_parser (1.5.1) + regexp_parser (1.6.0) request_store (1.4.1) rack (>= 1.4) - responders (2.4.1) - actionpack (>= 4.2.0, < 6.0) - railties (>= 4.2.0, < 6.0) + responders (3.0.0) + actionpack (>= 5.0) + railties (>= 5.0) rest-client (2.1.0) http-accept (>= 1.7.0, < 2.0) http-cookie (>= 1.0.2, < 2.0) @@ -618,7 +618,7 @@ GEM rspec-cells (0.3.4) cells (>= 4.0.0, < 6.0.0) rspec-rails (~> 3.2) - rspec-core (3.8.1) + rspec-core (3.8.2) rspec-support (~> 3.8.0) rspec-expectations (3.8.4) diff-lcs (>= 1.2.0, < 2.0) @@ -650,7 +650,7 @@ GEM rubocop-rails (2.0.1) rack (>= 1.1) rubocop (>= 0.70.0) - rubocop-rspec (1.33.0) + rubocop-rspec (1.35.0) rubocop (>= 0.60.0) ruby-ole (1.2.12.2) ruby-progressbar (1.10.1) @@ -669,15 +669,15 @@ GEM sprockets-rails tilt searchlight (4.1.0) - selenium-webdriver (3.142.3) - childprocess (>= 0.5, < 2.0) + selenium-webdriver (3.142.4) + childprocess (>= 0.5, < 3.0) rubyzip (~> 1.2, >= 1.2.2) - simplecov (0.16.1) + simplecov (0.17.1) docile (~> 1.1) json (>= 1.8, < 3) simplecov-html (~> 0.10.0) simplecov-html (0.10.2) - smart_properties (1.14.0) + smart_properties (1.15.0) social-share-button (1.2.1) coffee-rails spreadsheet (1.2.4) @@ -735,7 +735,7 @@ GEM activemodel (>= 5.0) bindex (>= 0.4.0) railties (>= 5.0) - webmock (3.6.0) + webmock (3.7.4) addressable (>= 2.3.6) crack (>= 0.3.2) hashdiff (>= 0.4.0, < 2.0.0) diff --git a/decidim-system/decidim-system.gemspec b/decidim-system/decidim-system.gemspec index 3ce3e711b43a..d161438a8afd 100644 --- a/decidim-system/decidim-system.gemspec +++ b/decidim-system/decidim-system.gemspec @@ -22,7 +22,7 @@ Gem::Specification.new do |s| s.add_dependency "active_link_to", "~> 1.0" s.add_dependency "decidim-core", Decidim::System.version - s.add_dependency "devise", "~> 4.6" + s.add_dependency "devise", "~> 4.7" s.add_dependency "devise-i18n", "~> 1.2" s.add_dependency "devise_invitable", "~> 1.7" s.add_dependency "jquery-rails", "~> 4.3" diff --git a/decidim_app-design/Gemfile.lock b/decidim_app-design/Gemfile.lock index 665098ed2de6..2b18cfceea6c 100644 --- a/decidim_app-design/Gemfile.lock +++ b/decidim_app-design/Gemfile.lock @@ -29,7 +29,7 @@ PATH decidim-admin (0.19.0.dev) active_link_to (~> 1.0) decidim-core (= 0.19.0.dev) - devise (~> 4.6) + devise (~> 4.7) devise-i18n (~> 1.2) devise_invitable (~> 1.7) jquery-rails (~> 4.3) @@ -76,7 +76,7 @@ PATH charlock_holmes (~> 0.7) date_validator (~> 0.9.0) decidim-api (= 0.19.0.dev) - devise (~> 4.6) + devise (~> 4.7) devise-i18n (~> 1.2) doorkeeper (~> 5.1) doorkeeper-i18n (~> 4.0) @@ -132,7 +132,7 @@ PATH factory_bot_rails (~> 4.8) i18n-tasks (~> 0.9.18) mdl (~> 0.5.0) - nokogiri (~> 1.10) + nokogiri (>= 1.10.4) puma (~> 3.12) rails-controller-testing (~> 1.0) rspec-cells (~> 0.3.4) @@ -198,7 +198,7 @@ PATH decidim-system (0.19.0.dev) active_link_to (~> 1.0) decidim-core (= 0.19.0.dev) - devise (~> 4.6) + devise (~> 4.7) devise-i18n (~> 1.2) devise_invitable (~> 1.7) jquery-rails (~> 4.3) @@ -272,7 +272,7 @@ GEM execjs (~> 2.0) batch-loader (1.4.1) bcrypt (3.1.13) - better_html (1.0.13) + better_html (1.0.14) actionview (>= 4.0) activesupport (>= 4.0) ast (~> 2.0) @@ -285,7 +285,7 @@ GEM msgpack (~> 1.0) builder (3.2.3) byebug (11.0.1) - capybara (3.24.0) + capybara (3.29.0) addressable mini_mime (>= 0.1.3) nokogiri (~> 1.8) @@ -309,7 +309,7 @@ GEM actionpack (>= 3.0) cells (>= 4.1.6, < 5.0.0) charlock_holmes (0.7.6) - childprocess (1.0.1) + childprocess (2.0.0) rake (< 13.0) coercible (1.0.0) descendants_tracker (~> 0.0.1) @@ -338,13 +338,13 @@ GEM declarative-option (0.1.0) descendants_tracker (0.0.4) thread_safe (~> 0.3, >= 0.3.1) - devise (4.6.2) + devise (4.7.1) bcrypt (~> 3.0) orm_adapter (~> 0.1) - railties (>= 4.1.0, < 6.0) + railties (>= 4.1.0) responders warden (~> 1.2.3) - devise-i18n (1.8.0) + devise-i18n (1.8.2) devise (>= 4.6) devise_invitable (1.7.5) actionmailer (>= 4.1.0) @@ -357,11 +357,11 @@ GEM docile (1.3.2) domain_name (0.5.20190701) unf (>= 0.0.5, < 1.0.0) - doorkeeper (5.1.0) + doorkeeper (5.2.0) railties (>= 5) doorkeeper-i18n (4.0.1) equalizer (0.0.11) - erb_lint (0.0.28) + erb_lint (0.0.29) activesupport better_html (~> 1.0.7) html_tokenizer @@ -404,7 +404,7 @@ GEM railties sprockets-rails graphql (1.9.6) - hashdiff (0.4.0) + hashdiff (1.0.0) hashie (3.6.0) highline (2.0.2) html_tokenizer (0.0.7) @@ -498,7 +498,7 @@ GEM netrc (0.11.0) nio4r (2.3.1) nobspw (0.6.1) - nokogiri (1.10.3) + nokogiri (1.10.4) mini_portile2 (~> 2.4.0) oauth (0.5.4) oauth2 (1.4.1) @@ -535,7 +535,7 @@ GEM activerecord (>= 4.2) request_store (~> 1.1) parallel (1.17.0) - parser (2.6.3.0) + parser (2.6.4.1) ast (~> 2.4.0) pg (1.1.4) pg_search (2.3.0) @@ -576,7 +576,7 @@ GEM rails-dom-testing (2.0.3) activesupport (>= 4.2.0) nokogiri (>= 1.6) - rails-html-sanitizer (1.0.4) + rails-html-sanitizer (1.2.0) loofah (~> 2.2, >= 2.2.2) rails-i18n (5.1.3) i18n (>= 0.7, < 2) @@ -588,7 +588,7 @@ GEM rake (>= 0.8.7) thor (>= 0.19.0, < 2.0) rainbow (3.0.0) - rake (12.3.2) + rake (12.3.3) ransack (2.1.1) actionpack (>= 5.0) activerecord (>= 5.0) @@ -605,12 +605,12 @@ GEM wisper (>= 1.6.1) redcarpet (3.5.0) redis (4.1.2) - regexp_parser (1.5.1) + regexp_parser (1.6.0) request_store (1.4.1) rack (>= 1.4) - responders (2.4.1) - actionpack (>= 4.2.0, < 6.0) - railties (>= 4.2.0, < 6.0) + responders (3.0.0) + actionpack (>= 5.0) + railties (>= 5.0) rest-client (2.1.0) http-accept (>= 1.7.0, < 2.0) http-cookie (>= 1.0.2, < 2.0) @@ -623,7 +623,7 @@ GEM rspec-cells (0.3.4) cells (>= 4.0.0, < 6.0.0) rspec-rails (~> 3.2) - rspec-core (3.8.1) + rspec-core (3.8.2) rspec-support (~> 3.8.0) rspec-expectations (3.8.4) diff-lcs (>= 1.2.0, < 2.0) @@ -655,7 +655,7 @@ GEM rubocop-rails (2.0.1) rack (>= 1.1) rubocop (>= 0.70.0) - rubocop-rspec (1.33.0) + rubocop-rspec (1.35.0) rubocop (>= 0.60.0) ruby-ole (1.2.12.2) ruby-progressbar (1.10.1) @@ -674,15 +674,15 @@ GEM sprockets-rails tilt searchlight (4.1.0) - selenium-webdriver (3.142.3) - childprocess (>= 0.5, < 2.0) + selenium-webdriver (3.142.4) + childprocess (>= 0.5, < 3.0) rubyzip (~> 1.2, >= 1.2.2) - simplecov (0.16.1) + simplecov (0.17.1) docile (~> 1.1) json (>= 1.8, < 3) simplecov-html (~> 0.10.0) simplecov-html (0.10.2) - smart_properties (1.14.0) + smart_properties (1.15.0) social-share-button (1.2.1) coffee-rails spreadsheet (1.2.4) @@ -740,7 +740,7 @@ GEM activemodel (>= 5.0) bindex (>= 0.4.0) railties (>= 5.0) - webmock (3.6.0) + webmock (3.7.4) addressable (>= 2.3.6) crack (>= 0.3.2) hashdiff (>= 0.4.0, < 2.0.0) From c7a3ea65f7af9c1b252c4d53684235f61b037336 Mon Sep 17 00:00:00 2001 From: Oriol Gual Date: Tue, 17 Sep 2019 23:49:54 +0200 Subject: [PATCH 2/3] Update rubocop --- .rubocop.yml | 6 ++++++ 1 file changed, 6 insertions(+) diff --git a/.rubocop.yml b/.rubocop.yml index 32396ece0d09..e1a1b87bd13c 100644 --- a/.rubocop.yml +++ b/.rubocop.yml @@ -1242,4 +1242,10 @@ RSpec/NamedSubject: RSpec/VerifiedDoubles: Enabled: false +RSpec/LeakyConstantDeclaration: + Enabled: false + +RSpec/DescribedClass: + Enabled: false + inherit_from: .rubocop_rails.yml From 46d76d86da8e7c8abcc9706717bdc991b966db18 Mon Sep 17 00:00:00 2001 From: Oriol Gual Date: Wed, 18 Sep 2019 09:07:57 +0200 Subject: [PATCH 3/3] Fix erblint complaints --- .../admin/results/_proposals.html.erb | 2 +- .../admin/results/index.html.erb | 2 +- .../admin/statuses/index.html.erb | 2 +- .../admin/timeline_entries/index.html.erb | 2 +- .../results/_show_leaf.html.erb | 2 +- .../attachment_collections/index.html.erb | 2 +- .../attachment_collections/show.html.erb | 2 +- .../decidim/admin/attachments/index.html.erb | 2 +- .../decidim/admin/attachments/show.html.erb | 2 +- .../decidim/admin/categories/index.html.erb | 4 +- .../decidim/admin/categories/show.html.erb | 2 +- .../select_recipients_to_deliver.html.erb | 2 +- .../index.html.erb | 4 +- .../admin/static_pages/_topic.html.erb | 2 +- .../decidim/admin/static_pages/show.html.erb | 2 +- .../decidim/admin/_application.html.erb | 12 ++-- .../layouts/decidim/admin/_header.html.erb | 2 +- .../admin/assemblies/index.html.erb | 6 +- .../admin/assembly_user_roles/index.html.erb | 6 +- .../assemblies/_parent_assemblies.html.erb | 2 +- .../assemblies/assemblies/show.html.erb | 2 +- .../decidim/blogs/admin/posts/index.html.erb | 2 +- .../budgets/admin/projects/index.html.erb | 2 +- .../conferences/conference_address/show.erb | 2 +- .../conferences/conference_speaker/show.erb | 4 +- .../conference_user_roles/index.html.erb | 6 +- .../admin/conferences/index.html.erb | 6 +- .../diploma_user.html.erb | 2 +- .../conferences/_partners.html.erb | 2 +- .../conferences/conferences/show.html.erb | 6 +- .../decidim/conferences/media/index.html.erb | 4 +- .../views/layouts/decidim/diploma.html.erb | 4 +- .../consultations/consultation_m/data.erb | 4 +- .../admin/consultations/index.html.erb | 4 +- .../admin/questions/index.html.erb | 4 +- .../consultations/questions/show.html.erb | 2 +- .../app/cells/decidim/address/details.erb | 4 +- .../app/cells/decidim/notifications/show.erb | 2 +- .../decidim/search_results_section/show.erb | 2 +- .../app/views/decidim/account/delete.html.erb | 4 +- .../app/views/decidim/account/show.html.erb | 2 +- .../decidim/amendments/preview_draft.html.erb | 2 +- .../doorkeeper/authorizations/new.html.erb | 6 +- .../data_portability_export.html.erb | 2 +- .../decidim/shared/_address_details.html.erb | 4 +- .../decidim/shared/_embed_modal.html.erb | 2 +- .../decidim/shared/_share_modal.html.erb | 2 +- .../app/views/layouts/decidim/_head.html.erb | 24 +++---- .../app/views/layouts/decidim/mailer.html.erb | 4 +- .../debates/admin/debates/index.html.erb | 2 +- .../decidim/forms/question_readonly/show.erb | 2 +- .../decidim/initiatives_votes/vote/show.erb | 2 +- .../initiatives/export_pdf_signatures.pdf.erb | 4 +- .../admin/initiatives/show.html.erb | 6 +- .../admin/initiatives_types/edit.html.erb | 2 +- .../committee_requests/new.html.erb | 2 +- .../create_initiative/fill_data.html.erb | 2 +- .../create_initiative/finish.html.erb | 2 +- .../create_initiative/previous_form.html.erb | 2 +- .../promotal_committee.html.erb | 2 +- .../select_initiative_type.html.erb | 4 +- .../show_similar_initiatives.html.erb | 2 +- .../initiative_signatures/finish.html.erb | 2 +- .../initiatives/initiatives/_result.html.erb | 4 +- .../initiatives/initiatives/show.html.erb | 2 +- .../initiatives/signature_identities.html.erb | 2 +- .../notify_creation.html.erb | 2 +- .../notify_progress.html.erb | 2 +- .../notify_state_change.html.erb | 2 +- .../notify_validating_request.html.erb | 2 +- .../decidim/admin/initiatives_votes.pdf.erb | 4 +- .../decidim/meetings/meetings_map/show.erb | 4 +- .../decidim/meetings/_calendar_modal.html.erb | 2 +- .../meetings/admin/meetings/index.html.erb | 2 +- .../meetings/_meeting_agenda.html.erb | 2 +- .../_conference_venues.html.erb | 2 +- .../process_m/data.erb | 4 +- .../index.html.erb | 2 +- .../index.html.erb | 2 +- .../participatory_process_steps/show.html.erb | 2 +- .../index.html.erb | 6 +- .../participatory_processes/index.html.erb | 6 +- .../admin/proposals/_proposal-tr.html.erb | 6 +- .../proposals/_proposal_preview.html.erb | 2 +- .../proposals/proposals/index.html.erb | 2 +- .../participatory_texts/_index.html.erb | 2 +- .../decidim/proposals/proposals/show.html.erb | 2 +- .../sortitions/sortitions/show.html.erb | 2 +- .../decidim/system/admins/index.html.erb | 2 +- .../views/decidim/system/admins/show.html.erb | 2 +- .../system/devise/passwords/edit.html.erb | 2 +- .../system/devise/shared/_links.html.erb | 12 ++-- .../system/organizations/index.html.erb | 2 +- .../system/organizations/show.html.erb | 2 +- .../layouts/decidim/system/_header.html.erb | 2 +- .../component-meetings-add-item.html.erb | 6 +- .../component-meetings-edit-errors.html.erb | 12 ++-- .../component-meetings-edit-item.html.erb | 6 +- .../admin/component-meetings-initial.html.erb | 12 ++-- .../admin/component-meetings-items.html.erb | 12 ++-- .../component-meetings-minutes-edit.html.erb | 4 +- .../admin/component-meetings-minutes.html.erb | 8 +-- .../component-meetings-with-content.html.erb | 12 ++-- .../component-proposals-actions.html.erb | 4 +- .../component-proposals-apply-action.html.erb | 4 +- .../admin/component-proposals-none.html.erb | 4 +- .../admin/component-proposals-search.html.erb | 4 +- .../component-proposals-selected.html.erb | 8 +-- .../views/admin/form-with-datepicker.html.erb | 2 +- .../views/admin/form-with-validation.html.erb | 16 ++--- .../admin/partials/_filter_table.html.erb | 2 +- .../partials/_participatory-article.html.erb | 2 +- .../views/admin/participatory-texts.html.erb | 4 +- .../app/views/admin/process-info.html.erb | 58 ++++++++--------- .../views/admin/process-steps-new.html.erb | 10 +-- .../app/views/admin/processes-new-2.html.erb | 10 +-- .../views/admin/processes-new-3-add.html.erb | 60 +++++++++--------- .../app/views/admin/processes-new.html.erb | 62 +++++++++---------- .../app/views/admin/scope-edit.html.erb | 4 +- .../app/views/admin/settings.html.erb | 12 ++-- .../app/views/layouts/admin.html.erb | 2 +- .../app/views/layouts/public.html.erb | 2 +- .../amendment-creation-wizard.html.erb | 2 +- ...osal-view-with-amendment-rejected.html.erb | 2 +- .../public/assemblies/assemblies.html.erb | 2 +- .../public/assemblies/assembly-view.html.erb | 6 +- .../views/public/cards/m/_assembly.html.erb | 2 +- .../public/cards/m/_consultation.html.erb | 2 +- .../views/public/cards/m/_meeting.html.erb | 10 +-- .../views/public/cards/m/_process.html.erb | 4 +- .../public/cards/m/_search-results.html.erb | 2 +- .../app/views/public/cards/m/_survey.html.erb | 2 +- .../conference-view-diploma.html.erb | 2 +- .../conference-view-media.html.erb | 4 +- .../conference-view-speakers.html.erb | 2 +- .../conferences/conference-view.html.erb | 12 ++-- .../consultations-entities-view.html.erb | 2 +- .../public/consultations-entities.html.erb | 12 ++-- .../public/consultations-meetings.html.erb | 12 ++-- .../consultations-voting-places.html.erb | 14 ++--- .../app/views/public/email-inline.html.erb | 6 +- .../app/views/public/form-datepicker.html.erb | 2 +- .../app/views/public/form-validation.html.erb | 6 +- .../views/public/home-single-process.html.erb | 4 +- .../home-with-consultation-banners.html.erb | 2 +- .../views/public/home-with-helpers.html.erb | 4 +- .../app/views/public/home.html.erb | 4 +- .../app/views/public/index.html.erb | 4 +- .../initiatives-support-step-1.html.erb | 6 +- .../initiatives-support-step-2.html.erb | 2 +- .../initiatives-support-step-3.html.erb | 14 ++--- .../public/library/_library-buttons.html.erb | 4 +- .../public/library/_library-icons.html.erb | 2 +- .../library/_library-javascripts.html.erb | 10 +-- .../meetings/meeting-view-closed.html.erb | 10 +-- .../meeting-view-custom-status.html.erb | 10 +-- .../meetings/meeting-view-longer.html.erb | 10 +-- .../public/meetings/meeting-view.html.erb | 4 +- .../public/meetings/meetings-callout.html.erb | 6 +- .../views/public/meetings/meetings.html.erb | 4 +- .../app/views/public/oauth.html.erb | 6 +- .../public/partials/_block_banner.html.erb | 2 +- .../public/partials/_budget_summary.html.erb | 2 +- .../views/public/partials/_comments.html.erb | 4 +- .../public/partials/_conferences_nav.html.erb | 2 +- .../_consultations_header_home.html.erb | 2 +- .../views/public/partials/_filters.html.erb | 38 ++++++------ .../partials/_filters_notifications.html.erb | 10 +-- .../partials/_filters_small_view.html.erb | 10 +-- .../app/views/public/partials/_flag.html.erb | 6 +- .../partials/_meetings_highlights.html.erb | 8 +-- .../partials/_related_meetings.html.erb | 4 +- .../public/partials/_search_input.html.erb | 2 +- .../app/views/public/partials/_tags.html.erb | 2 +- .../views/public/partials/_topbar.html.erb | 2 +- .../public/participatory/_index.html.erb | 4 +- .../public/profile/_conversation.html.erb | 2 +- .../public/profile/_conversations.html.erb | 4 +- .../public/profile/_notifications.html.erb | 2 +- .../views/public/profile/_user-card.html.erb | 2 +- .../public/proposals/new-proposal.html.erb | 2 +- .../proposals-wizard-step-1.html.erb | 2 +- .../proposals-wizard-step-3.html.erb | 2 +- .../app/views/public/search.html.erb | 4 +- .../_modal-question-user-existent.html.erb | 4 +- .../user/_modal-question-user-new.html.erb | 6 +- .../public/user/_modal-question.html.erb | 2 +- .../views/public/user/user-confirm.html.erb | 2 +- .../public/user/user-invitation.html.erb | 4 +- .../app/views/public/user/user-login.html.erb | 6 +- .../public/user/user-new-password.html.erb | 2 +- .../views/public/user/user-register.html.erb | 20 +++--- .../views/public/user/user-settings.html.erb | 20 +++--- .../public/user/user-verification.html.erb | 6 +- .../views/public/vizzs/_areacharts.html.erb | 22 +++---- .../views/public/vizzs/_linecharts.html.erb | 12 ++-- .../views/public/vizzs/_rowcharts.html.erb | 18 +++--- 197 files changed, 553 insertions(+), 553 deletions(-) diff --git a/decidim-accountability/app/views/decidim/accountability/admin/results/_proposals.html.erb b/decidim-accountability/app/views/decidim/accountability/admin/results/_proposals.html.erb index b74da64d4f5b..7031ce9cabf8 100644 --- a/decidim-accountability/app/views/decidim/accountability/admin/results/_proposals.html.erb +++ b/decidim-accountability/app/views/decidim/accountability/admin/results/_proposals.html.erb @@ -2,7 +2,7 @@

<%= t(".current_selection") %>

- +
diff --git a/decidim-accountability/app/views/decidim/accountability/admin/results/index.html.erb b/decidim-accountability/app/views/decidim/accountability/admin/results/index.html.erb index ae299b59c00d..b3268d89d91a 100644 --- a/decidim-accountability/app/views/decidim/accountability/admin/results/index.html.erb +++ b/decidim-accountability/app/views/decidim/accountability/admin/results/index.html.erb @@ -24,7 +24,7 @@ <% results.each do |result| %> - <%= link_to translated_attribute(result.title), results_path(parent_id: result.id) %>
+ <%= link_to translated_attribute(result.title), results_path(parent_id: result.id) %>
<%= icon_link_to "eye", resource_locator(result).path, t("actions.preview", scope: "decidim.accountability"), class: "action-icon--preview", target: :blank %> diff --git a/decidim-accountability/app/views/decidim/accountability/admin/statuses/index.html.erb b/decidim-accountability/app/views/decidim/accountability/admin/statuses/index.html.erb index fc17518e23f3..5678994a8f2e 100644 --- a/decidim-accountability/app/views/decidim/accountability/admin/statuses/index.html.erb +++ b/decidim-accountability/app/views/decidim/accountability/admin/statuses/index.html.erb @@ -21,7 +21,7 @@ <% statuses.each do |status| %> - <%= status.key %>
+ <%= status.key %>
<%= translated_attribute(status.name) %> <%= truncate translated_attribute(status.description), lenght: 50 %> <%= status.progress %> diff --git a/decidim-accountability/app/views/decidim/accountability/admin/timeline_entries/index.html.erb b/decidim-accountability/app/views/decidim/accountability/admin/timeline_entries/index.html.erb index 94d9d5908d6e..ea442c2c133a 100644 --- a/decidim-accountability/app/views/decidim/accountability/admin/timeline_entries/index.html.erb +++ b/decidim-accountability/app/views/decidim/accountability/admin/timeline_entries/index.html.erb @@ -20,7 +20,7 @@ <% timeline_entries.each do |timeline_entry| %> - <%= timeline_entry.entry_date %>
+ <%= timeline_entry.entry_date %>
<%= translated_attribute(timeline_entry.description) %> <% if allowed_to? :update, :timeline_entry, timeline_entry: timeline_entry %> diff --git a/decidim-accountability/app/views/decidim/accountability/results/_show_leaf.html.erb b/decidim-accountability/app/views/decidim/accountability/results/_show_leaf.html.erb index a4c4b5fb4a49..1ab9905be074 100644 --- a/decidim-accountability/app/views/decidim/accountability/results/_show_leaf.html.erb +++ b/decidim-accountability/app/views/decidim/accountability/results/_show_leaf.html.erb @@ -58,7 +58,7 @@
-
+
diff --git a/decidim-admin/app/views/decidim/admin/attachment_collections/index.html.erb b/decidim-admin/app/views/decidim/admin/attachment_collections/index.html.erb index e983a1ce6376..de7d421ad54b 100644 --- a/decidim-admin/app/views/decidim/admin/attachment_collections/index.html.erb +++ b/decidim-admin/app/views/decidim/admin/attachment_collections/index.html.erb @@ -22,7 +22,7 @@ <% collection_for.attachment_collections.each do |attachment_collection| %> - <%= link_to translated_attribute(attachment_collection.name), edit_polymorphic_path([collection_for, attachment_collection]) %>
+ <%= link_to translated_attribute(attachment_collection.name), edit_polymorphic_path([collection_for, attachment_collection]) %>
<% if allowed_to? :update, :attachment_collection, attachment_collection: attachment_collection %> diff --git a/decidim-admin/app/views/decidim/admin/attachment_collections/show.html.erb b/decidim-admin/app/views/decidim/admin/attachment_collections/show.html.erb index 93201708219a..d234d081f731 100644 --- a/decidim-admin/app/views/decidim/admin/attachment_collections/show.html.erb +++ b/decidim-admin/app/views/decidim/admin/attachment_collections/show.html.erb @@ -1,7 +1,7 @@

<%= translated_attribute(@attachment_collection.name) %>

-
+
<%= link_to t("decidim.admin.actions.edit"), ["edit", @attachment_collection.collection_for, @attachment_collection], class: "button" if allowed_to? :update, :attachment_collection, attachment_collection: @attachment_collection %> <%= link_to t("decidim.admin.actions.destroy"), [@attachment_collection.collection_for, @attachment_collection], method: :delete, class: "alert button", data: { confirm: t("decidim.admin.actions.confirm_destroy") } if allowed_to? :destroy, :attachment_collection, attachment_collection: @attachment_collection %>
diff --git a/decidim-admin/app/views/decidim/admin/attachments/index.html.erb b/decidim-admin/app/views/decidim/admin/attachments/index.html.erb index e212aa9fee95..b5c56424efe4 100644 --- a/decidim-admin/app/views/decidim/admin/attachments/index.html.erb +++ b/decidim-admin/app/views/decidim/admin/attachments/index.html.erb @@ -25,7 +25,7 @@ <% attached_to.attachments.each do |attachment| %> - <%= link_to translated_attribute(attachment.title), edit_polymorphic_path([attached_to, attachment]) %>
+ <%= link_to translated_attribute(attachment.title), edit_polymorphic_path([attached_to, attachment]) %>
<%= translated_attribute(attachment.attachment_collection&.name) %> diff --git a/decidim-admin/app/views/decidim/admin/attachments/show.html.erb b/decidim-admin/app/views/decidim/admin/attachments/show.html.erb index 3cc9da515ac4..8af67fa8a9b1 100644 --- a/decidim-admin/app/views/decidim/admin/attachments/show.html.erb +++ b/decidim-admin/app/views/decidim/admin/attachments/show.html.erb @@ -1,7 +1,7 @@

<%= translated_attribute(@attachment.title) %>

-
+
<%= link_to t("decidim.admin.actions.edit"), ["edit", @attachment.attached_to, @attachment] if allowed_to? :update, :attachment, attachment: @attachment %> <%= link_to t("decidim.admin.actions.destroy"), [@attachment.attached_to, @attachment], method: :delete, class: "alert button", data: { confirm: t("decidim.admin.actions.confirm_destroy") } if allowed_to? :destroy, :attachment, attachment: @attachment %>
diff --git a/decidim-admin/app/views/decidim/admin/categories/index.html.erb b/decidim-admin/app/views/decidim/admin/categories/index.html.erb index c33b31138b75..873a5cc02e62 100644 --- a/decidim-admin/app/views/decidim/admin/categories/index.html.erb +++ b/decidim-admin/app/views/decidim/admin/categories/index.html.erb @@ -22,7 +22,7 @@ <% current_participatory_space.categories.first_class.each do |category| %> - <%= link_to translated_attribute(category.name), edit_category_path(current_participatory_space, category) %>
+ <%= link_to translated_attribute(category.name), edit_category_path(current_participatory_space, category) %>
<% if allowed_to? :update, :category, category: category %> @@ -43,7 +43,7 @@ <% category.subcategories.each do |subcategory| %> - <%= link_to translated_attribute(subcategory.name), edit_category_path(current_participatory_space, subcategory) %>
+ <%= link_to translated_attribute(subcategory.name), edit_category_path(current_participatory_space, subcategory) %>
<% if allowed_to? :update, :category, category: subcategory %> diff --git a/decidim-admin/app/views/decidim/admin/categories/show.html.erb b/decidim-admin/app/views/decidim/admin/categories/show.html.erb index 3d5419599b16..5ee8a3ba0f6d 100644 --- a/decidim-admin/app/views/decidim/admin/categories/show.html.erb +++ b/decidim-admin/app/views/decidim/admin/categories/show.html.erb @@ -1,7 +1,7 @@

<%= translated_attribute(@category.name) %>

-
+
<%= link_to t("decidim.admin.actions.edit"), ["edit", participatory_space, @category] if allowed_to? :update, :category, category: @category %> <%= link_to t("decidim.admin.actions.destroy"), [participatory_space, @category], method: :delete, class: "alert button", data: { confirm: t("decidim.admin.actions.confirm_destroy") } if allowed_to? :destroy, :category, category: @category %>
diff --git a/decidim-admin/app/views/decidim/admin/newsletters/select_recipients_to_deliver.html.erb b/decidim-admin/app/views/decidim/admin/newsletters/select_recipients_to_deliver.html.erb index 1e8f887fa90c..e8d7529e1403 100644 --- a/decidim-admin/app/views/decidim/admin/newsletters/select_recipients_to_deliver.html.erb +++ b/decidim-admin/app/views/decidim/admin/newsletters/select_recipients_to_deliver.html.erb @@ -22,7 +22,7 @@

<%= t ".all_users_help" %>

-
+
<% end %>
diff --git a/decidim-admin/app/views/decidim/admin/participatory_space_private_users/index.html.erb b/decidim-admin/app/views/decidim/admin/participatory_space_private_users/index.html.erb index ca7474157029..58ec69815fc8 100644 --- a/decidim-admin/app/views/decidim/admin/participatory_space_private_users/index.html.erb +++ b/decidim-admin/app/views/decidim/admin/participatory_space_private_users/index.html.erb @@ -26,10 +26,10 @@ <% collection.each do |private_user| %> - <%= private_user.user.name %>
+ <%= private_user.user.name %>
- <%= private_user.user.email %>
+ <%= private_user.user.email %>
<% if private_user.user.invitation_sent_at %> diff --git a/decidim-admin/app/views/decidim/admin/static_pages/_topic.html.erb b/decidim-admin/app/views/decidim/admin/static_pages/_topic.html.erb index 3661b4517a7a..018cb7c8656b 100644 --- a/decidim-admin/app/views/decidim/admin/static_pages/_topic.html.erb +++ b/decidim-admin/app/views/decidim/admin/static_pages/_topic.html.erb @@ -28,7 +28,7 @@ <% pages.each do |page| %> - <%= link_to translated_attribute(page.title), ["edit", page] %>
+ <%= link_to translated_attribute(page.title), ["edit", page] %>
<%= l page.created_at, format: :short %> diff --git a/decidim-admin/app/views/decidim/admin/static_pages/show.html.erb b/decidim-admin/app/views/decidim/admin/static_pages/show.html.erb index fd8a81bc867e..69b9fbf1937f 100644 --- a/decidim-admin/app/views/decidim/admin/static_pages/show.html.erb +++ b/decidim-admin/app/views/decidim/admin/static_pages/show.html.erb @@ -3,7 +3,7 @@ <% end %>
-
+
<% if allowed_to? :update, :static_page, static_page: @page %> <%= link_to t("decidim.admin.actions.edit"), ["edit", @page] %> <% end %> diff --git a/decidim-admin/app/views/layouts/decidim/admin/_application.html.erb b/decidim-admin/app/views/layouts/decidim/admin/_application.html.erb index 2a9ebebc9806..9927acfb86dd 100644 --- a/decidim-admin/app/views/layouts/decidim/admin/_application.html.erb +++ b/decidim-admin/app/views/layouts/decidim/admin/_application.html.erb @@ -1,12 +1,12 @@ - - - - - - + + + + + + <%= title %> <%= render partial: "layouts/decidim/admin/header" %> <%= foundation_datepicker_locale_tag %> diff --git a/decidim-admin/app/views/layouts/decidim/admin/_header.html.erb b/decidim-admin/app/views/layouts/decidim/admin/_header.html.erb index e9833bddc4d0..bf7b69100da1 100644 --- a/decidim-admin/app/views/layouts/decidim/admin/_header.html.erb +++ b/decidim-admin/app/views/layouts/decidim/admin/_header.html.erb @@ -1,4 +1,4 @@ - + <%= csrf_meta_tags %> <%= stylesheet_link_tag "decidim/admin/application", media: "all" %> <%= javascript_include_tag "decidim/admin/application" %> diff --git a/decidim-assemblies/app/views/decidim/assemblies/admin/assemblies/index.html.erb b/decidim-assemblies/app/views/decidim/assemblies/admin/assemblies/index.html.erb index 84a94a175c39..18cc18011aa9 100644 --- a/decidim-assemblies/app/views/decidim/assemblies/admin/assemblies/index.html.erb +++ b/decidim-assemblies/app/views/decidim/assemblies/admin/assemblies/index.html.erb @@ -45,11 +45,11 @@ <% end %> <% if allowed_to? :update, :assembly, assembly: assembly %> - <%= link_to translated_attribute(assembly.title), edit_assembly_path(assembly) %>
+ <%= link_to translated_attribute(assembly.title), edit_assembly_path(assembly) %>
<% elsif allowed_to? :preview, :assembly, assembly: assembly %> - <%= link_to translated_attribute(assembly.title), decidim_assemblies.assembly_path(assembly) %>
+ <%= link_to translated_attribute(assembly.title), decidim_assemblies.assembly_path(assembly) %>
<% elsif allowed_to? :read, :moderation, assembly: assembly %> - <%= link_to translated_attribute(assembly.title), moderations_path(assembly) %>
+ <%= link_to translated_attribute(assembly.title), moderations_path(assembly) %>
<% else %> <%= translated_attribute(assembly.title) %> <% end %> diff --git a/decidim-assemblies/app/views/decidim/assemblies/admin/assembly_user_roles/index.html.erb b/decidim-assemblies/app/views/decidim/assemblies/admin/assembly_user_roles/index.html.erb index 4fa6d7c9c4f9..e8ec25b11ccf 100644 --- a/decidim-assemblies/app/views/decidim/assemblies/admin/assembly_user_roles/index.html.erb +++ b/decidim-assemblies/app/views/decidim/assemblies/admin/assembly_user_roles/index.html.erb @@ -25,10 +25,10 @@ <% @assembly_user_roles.each do |role| %> - <%= role.user.name %>
+ <%= role.user.name %>
- <%= role.user.email %>
+ <%= role.user.email %>
<% if role.user.invitation_sent_at %> @@ -41,7 +41,7 @@ <% end %> - <%= t("#{role.role}", scope: "decidim.admin.models.assembly_user_role.roles") %>
+ <%= t("#{role.role}", scope: "decidim.admin.models.assembly_user_role.roles") %>
<% if allowed_to?(:invite, :assembly_user_role, user_role: role) && role.user.invited_to_sign_up? %> diff --git a/decidim-assemblies/app/views/decidim/assemblies/assemblies/_parent_assemblies.html.erb b/decidim-assemblies/app/views/decidim/assemblies/assemblies/_parent_assemblies.html.erb index 475cd54fe938..df7026e86998 100644 --- a/decidim-assemblies/app/views/decidim/assemblies/assemblies/_parent_assemblies.html.erb +++ b/decidim-assemblies/app/views/decidim/assemblies/assemblies/_parent_assemblies.html.erb @@ -6,7 +6,7 @@ <%= render partial: "decidim/assemblies/filter_by_type" %>
-
+
<%= render partial: "decidim/shared/participatory_space_filters/show" %>
diff --git a/decidim-assemblies/app/views/decidim/assemblies/assemblies/show.html.erb b/decidim-assemblies/app/views/decidim/assemblies/assemblies/show.html.erb index 7bed5e8971cd..276431361a16 100644 --- a/decidim-assemblies/app/views/decidim/assemblies/assemblies/show.html.erb +++ b/decidim-assemblies/app/views/decidim/assemblies/assemblies/show.html.erb @@ -203,7 +203,7 @@ edit_link(
<%= t("closing_date", scope: "decidim.assemblies.show") %> <%= l(current_participatory_space.closing_date, format: :decidim_short) %> -
+
<%= decidim_sanitize translated_attribute(current_participatory_space.closing_date_reason) %>
<% end %> diff --git a/decidim-blogs/app/views/decidim/blogs/admin/posts/index.html.erb b/decidim-blogs/app/views/decidim/blogs/admin/posts/index.html.erb index 0d6300cd0506..b913b9656f50 100644 --- a/decidim-blogs/app/views/decidim/blogs/admin/posts/index.html.erb +++ b/decidim-blogs/app/views/decidim/blogs/admin/posts/index.html.erb @@ -23,7 +23,7 @@ - <%= translated_attribute(post.title) %>
+ <%= translated_attribute(post.title) %>
<%= decidim_sanitize post_description_admin(post) %> diff --git a/decidim-budgets/app/views/decidim/budgets/admin/projects/index.html.erb b/decidim-budgets/app/views/decidim/budgets/admin/projects/index.html.erb index bbed6326662d..6e480a5f8b9c 100644 --- a/decidim-budgets/app/views/decidim/budgets/admin/projects/index.html.erb +++ b/decidim-budgets/app/views/decidim/budgets/admin/projects/index.html.erb @@ -21,7 +21,7 @@ <% projects.each do |project| %> - <%= translated_attribute(project.title) %>
+ <%= translated_attribute(project.title) %>
<%= project.confirmed_orders_count %> diff --git a/decidim-conferences/app/cells/decidim/conferences/conference_address/show.erb b/decidim-conferences/app/cells/decidim/conferences/conference_address/show.erb index a895d297bae5..f71461b96c5f 100644 --- a/decidim-conferences/app/cells/decidim/conferences/conference_address/show.erb +++ b/decidim-conferences/app/cells/decidim/conferences/conference_address/show.erb @@ -1,7 +1,7 @@
<% if model.respond_to? :location %>
- <%= translated_attribute model.location %>
+ <%= translated_attribute model.location %>
<% end %>
<%= model.address %>
diff --git a/decidim-conferences/app/cells/decidim/conferences/conference_speaker/show.erb b/decidim-conferences/app/cells/decidim/conferences/conference_speaker/show.erb index 020d760e3be5..f5246ac04d35 100644 --- a/decidim-conferences/app/cells/decidim/conferences/conference_speaker/show.erb +++ b/decidim-conferences/app/cells/decidim/conferences/conference_speaker/show.erb @@ -67,14 +67,14 @@ <% end %>
<% if meetings.present? %> -
+
Speaking at
    <% meetings.each do |meeting| %> - <%= meeting_title meeting %>
    + <%= meeting_title meeting %>
    <% end %>
diff --git a/decidim-conferences/app/views/decidim/conferences/admin/conference_user_roles/index.html.erb b/decidim-conferences/app/views/decidim/conferences/admin/conference_user_roles/index.html.erb index 4fb0ed35f87c..60078c3b32e1 100644 --- a/decidim-conferences/app/views/decidim/conferences/admin/conference_user_roles/index.html.erb +++ b/decidim-conferences/app/views/decidim/conferences/admin/conference_user_roles/index.html.erb @@ -25,10 +25,10 @@ <% @conference_user_roles.each do |role| %> - <%= role.user.name %>
+ <%= role.user.name %>
- <%= role.user.email %>
+ <%= role.user.email %>
<% if role.user.invitation_sent_at %> @@ -41,7 +41,7 @@ <% end %> - <%= t("#{role.role}", scope: "decidim.admin.models.conference_user_role.roles") %>
+ <%= t("#{role.role}", scope: "decidim.admin.models.conference_user_role.roles") %>
<% if allowed_to?(:invite, :conference_user_role, user_role: role) && role.user.invited_to_sign_up? %> diff --git a/decidim-conferences/app/views/decidim/conferences/admin/conferences/index.html.erb b/decidim-conferences/app/views/decidim/conferences/admin/conferences/index.html.erb index 4011006d1d17..afb5691e4744 100644 --- a/decidim-conferences/app/views/decidim/conferences/admin/conferences/index.html.erb +++ b/decidim-conferences/app/views/decidim/conferences/admin/conferences/index.html.erb @@ -26,11 +26,11 @@ <% end %> <% if allowed_to? :update, :conference, conference: conference %> - <%= link_to translated_attribute(conference.title), edit_conference_path(conference) %>
+ <%= link_to translated_attribute(conference.title), edit_conference_path(conference) %>
<% elsif allowed_to? :preview, :conference, conference: conference %> - <%= link_to translated_attribute(conference.title), decidim_conferences.conference_path(conference) %>
+ <%= link_to translated_attribute(conference.title), decidim_conferences.conference_path(conference) %>
<% elsif allowed_to? :read, :moderation, conference: conference %> - <%= link_to translated_attribute(conference.title), moderations_path(conference) %>
+ <%= link_to translated_attribute(conference.title), moderations_path(conference) %>
<% else %> <%= translated_attribute(conference.title) %> <% end %> diff --git a/decidim-conferences/app/views/decidim/conferences/admin/send_conference_diploma_mailer/diploma_user.html.erb b/decidim-conferences/app/views/decidim/conferences/admin/send_conference_diploma_mailer/diploma_user.html.erb index 616856615b9c..33100dd197ae 100644 --- a/decidim-conferences/app/views/decidim/conferences/admin/send_conference_diploma_mailer/diploma_user.html.erb +++ b/decidim-conferences/app/views/decidim/conferences/admin/send_conference_diploma_mailer/diploma_user.html.erb @@ -10,7 +10,7 @@

<%= t("decidim.conferences.admin.send_conference_diploma_mailer.diploma_user.certificate_of_attendance") %>

<%= t("decidim.conferences.admin.send_conference_diploma_mailer.diploma_user.certificate_of_attendance_description", user: @user.name, title: translated_attribute(@conference.title), location: @conference.location, start: l(@conference.start_date, format: :decidim_short), end: l(@conference.end_date, format: :decidim_short) ).html_safe %>

-
+
<%= t("decidim.conferences.admin.send_conference_diploma_mailer.diploma_user.attendance_verified_by") %>
diff --git a/decidim-conferences/app/views/decidim/conferences/conferences/_partners.html.erb b/decidim-conferences/app/views/decidim/conferences/conferences/_partners.html.erb index 44b0c895aed7..1f5414557d44 100644 --- a/decidim-conferences/app/views/decidim/conferences/conferences/_partners.html.erb +++ b/decidim-conferences/app/views/decidim/conferences/conferences/_partners.html.erb @@ -1,7 +1,7 @@ <% if conference.partners.any? %>
<% conference.partners.group_by(&:partner_type).each do |partner_type, partners| %> -
+

<%= t(".#{partner_type.pluralize}") %>

diff --git a/decidim-conferences/app/views/decidim/conferences/conferences/show.html.erb b/decidim-conferences/app/views/decidim/conferences/conferences/show.html.erb index 7890b8e85d4a..c9202543bb7b 100644 --- a/decidim-conferences/app/views/decidim/conferences/conferences/show.html.erb +++ b/decidim-conferences/app/views/decidim/conferences/conferences/show.html.erb @@ -22,7 +22,7 @@ edit_link(

<%= t("conferences.show.introduction", scope: "decidim") %>

<%= decidim_sanitize translated_attribute(current_participatory_space.short_description) %>
-
+

<%= t("conferences.show.details", scope: "decidim") %>

<%= decidim_sanitize translated_attribute(current_participatory_space.description) %> @@ -53,7 +53,7 @@ edit_link( <%= render_hook(:conference_venues) %> <% if current_participatory_space.registrations_enabled? %> -
+

<%= t(".register") %>

<% if current_user.present? %> @@ -72,7 +72,7 @@ edit_link(
<% end %> -
+
<% unless translated_attribute(current_participatory_space.objectives).blank? %>
diff --git a/decidim-conferences/app/views/decidim/conferences/media/index.html.erb b/decidim-conferences/app/views/decidim/conferences/media/index.html.erb index e61426c80c99..b3931a422d3b 100644 --- a/decidim-conferences/app/views/decidim/conferences/media/index.html.erb +++ b/decidim-conferences/app/views/decidim/conferences/media/index.html.erb @@ -16,7 +16,7 @@ edit_link(

<%= t("media.index.title", scope: "decidim") %>

<%= t("media.index.description", scope: "decidim") %>

-
+
    <% @media_links.each do |media_link| %> @@ -24,7 +24,7 @@ edit_link( <% end %>
-
+
<% end %> <%= attachments_for_conference current_participatory_space %>
diff --git a/decidim-conferences/app/views/layouts/decidim/diploma.html.erb b/decidim-conferences/app/views/layouts/decidim/diploma.html.erb index e5172758e10c..6052538a1b0f 100644 --- a/decidim-conferences/app/views/layouts/decidim/diploma.html.erb +++ b/decidim-conferences/app/views/layouts/decidim/diploma.html.erb @@ -1,8 +1,8 @@ - - + + <%= wicked_pdf_stylesheet_link_tag "decidim/conference-diploma" %> diff --git a/decidim-consultations/app/cells/decidim/consultations/consultation_m/data.erb b/decidim-consultations/app/cells/decidim/consultations/consultation_m/data.erb index 6f6eebd4bc58..9b54fd3a90c0 100644 --- a/decidim-consultations/app/cells/decidim/consultations/consultation_m/data.erb +++ b/decidim-consultations/app/cells/decidim/consultations/consultation_m/data.erb @@ -6,14 +6,14 @@
  • <%= t("activemodel.attributes.consultation.start_voting_date") %> -
    +
    <%= start_date ? l(start_date, format: :decidim_short) : t("decidim.consultations.show.unspecified") %>
  • <%= t("activemodel.attributes.consultation.end_voting_date") %> -
    +
    <%= end_date ? l(end_date, format: :decidim_short) : t("decidim.consultations.show.unspecified") %>
    • diff --git a/decidim-consultations/app/views/decidim/consultations/admin/consultations/index.html.erb b/decidim-consultations/app/views/decidim/consultations/admin/consultations/index.html.erb index e1f3f7f31d93..c745e94a85aa 100644 --- a/decidim-consultations/app/views/decidim/consultations/admin/consultations/index.html.erb +++ b/decidim-consultations/app/views/decidim/consultations/admin/consultations/index.html.erb @@ -25,12 +25,12 @@ <% if allowed_to? :update, :consultation, consultation: consultation %> <%= link_to translated_attribute(consultation.title), edit_consultation_path(consultation) %> -
    +
    <% elsif allowed_to? :preview, :consultation, consultation: consultation %> <%= link_to translated_attribute(consultation.title), decidim_consultations.consultation_path(consultation), target: "_blank" %> -
    +
    <% else %> <%= translated_attribute(consultation.title) %> <% end %> diff --git a/decidim-consultations/app/views/decidim/consultations/admin/questions/index.html.erb b/decidim-consultations/app/views/decidim/consultations/admin/questions/index.html.erb index 9965a4145f74..693641b9f70c 100644 --- a/decidim-consultations/app/views/decidim/consultations/admin/questions/index.html.erb +++ b/decidim-consultations/app/views/decidim/consultations/admin/questions/index.html.erb @@ -25,12 +25,12 @@ <% if allowed_to? :update, :question, question: question %> <%= link_to decidim_sanitize(translated_attribute(question.title)), edit_question_path(question) %> -
    +
    <% elsif allowed_to? :preview, :question, question: question %> <%= link_to translated_attribute(question.title), decidim_consultations.question_path(question), target: "_blank" %> -
    +
    <% else %> <%= translated_attribute(question.title) %> <% end %> diff --git a/decidim-consultations/app/views/decidim/consultations/questions/show.html.erb b/decidim-consultations/app/views/decidim/consultations/questions/show.html.erb index 6472c0e71a09..ecf72ae19728 100644 --- a/decidim-consultations/app/views/decidim/consultations/questions/show.html.erb +++ b/decidim-consultations/app/views/decidim/consultations/questions/show.html.erb @@ -36,7 +36,7 @@ <%= content_for :question_header_details do %>
    - +
    diff --git a/decidim-core/app/cells/decidim/address/details.erb b/decidim-core/app/cells/decidim/address/details.erb index dd5cc6f720dd..c1f91f3a08ad 100644 --- a/decidim-core/app/cells/decidim/address/details.erb +++ b/decidim-core/app/cells/decidim/address/details.erb @@ -1,7 +1,7 @@ <% if model.respond_to? :location %> - <%= translated_attribute model.location %>
    + <%= translated_attribute model.location %>
    <% end %> -<%= model.address %>
    +<%= model.address %>
    <% if model.respond_to? :location_hints %> <%= translated_attribute model.location_hints %> <% end %> diff --git a/decidim-core/app/cells/decidim/notifications/show.erb b/decidim-core/app/cells/decidim/notifications/show.erb index 4e027abc415e..83e6b018cf8f 100644 --- a/decidim-core/app/cells/decidim/notifications/show.erb +++ b/decidim-core/app/cells/decidim/notifications/show.erb @@ -28,7 +28,7 @@
  • <%= notification.event_class.constantize.model_name.human %> -
    +
    <%= notification.event_class_instance.notification_title %> diff --git a/decidim-core/app/cells/decidim/search_results_section/show.erb b/decidim-core/app/cells/decidim/search_results_section/show.erb index 0c528d1dbfb8..006e48194cc0 100644 --- a/decidim-core/app/cells/decidim/search_results_section/show.erb +++ b/decidim-core/app/cells/decidim/search_results_section/show.erb @@ -20,5 +20,5 @@ <% end %> <% if last_section? %> -
    +
    <% end %> diff --git a/decidim-core/app/views/decidim/account/delete.html.erb b/decidim-core/app/views/decidim/account/delete.html.erb index 55f24071149f..83d7c8af4c79 100644 --- a/decidim-core/app/views/decidim/account/delete.html.erb +++ b/decidim-core/app/views/decidim/account/delete.html.erb @@ -11,7 +11,7 @@ <%= f.text_area :delete_reason, rows: 2, label: false %>
    - " /> + "> <% end %>
    <%= decidim_form_for(@form, url: account_path, method: :delete, html: { class: "user-form delete-account-modal" }) do |f| %> @@ -19,7 +19,7 @@

    <%= t(".confirm.question") %>

    - " /> + ">
    - " readonly /> + " readonly>
    • <%= javascript_include_tag "decidim/social_share" %> diff --git a/decidim-core/app/views/layouts/decidim/_head.html.erb b/decidim-core/app/views/layouts/decidim/_head.html.erb index bfa9dcbb57f7..b3684d4b5da3 100644 --- a/decidim-core/app/views/layouts/decidim/_head.html.erb +++ b/decidim-core/app/views/layouts/decidim/_head.html.erb @@ -1,21 +1,21 @@ <%= csrf_meta_tags %> - + <% available_locales.each do |locale| %> - + <% end %> - - - - - + + + + + - - - - - + + + + + <%= favicon %> <%= stylesheet_link_tag "application", media: "all" %> diff --git a/decidim-core/app/views/layouts/decidim/mailer.html.erb b/decidim-core/app/views/layouts/decidim/mailer.html.erb index 4d181ddba0ef..fa3247301d2e 100644 --- a/decidim-core/app/views/layouts/decidim/mailer.html.erb +++ b/decidim-core/app/views/layouts/decidim/mailer.html.erb @@ -1,8 +1,8 @@ - - + + <%= stylesheet_link_tag "decidim/email" %> diff --git a/decidim-debates/app/views/decidim/debates/admin/debates/index.html.erb b/decidim-debates/app/views/decidim/debates/admin/debates/index.html.erb index c9b43d4bb119..238143477709 100644 --- a/decidim-debates/app/views/decidim/debates/admin/debates/index.html.erb +++ b/decidim-debates/app/views/decidim/debates/admin/debates/index.html.erb @@ -22,7 +22,7 @@ <% debates.each do |debate| %> - <%= link_to translated_attribute(debate.title), resource_locator(debate).path, target: :blank %>
    + <%= link_to translated_attribute(debate.title), resource_locator(debate).path, target: :blank %>
    <% if debate.start_time %> diff --git a/decidim-forms/app/cells/decidim/forms/question_readonly/show.erb b/decidim-forms/app/cells/decidim/forms/question_readonly/show.erb index e2acbdf6aedb..87f1b44f8690 100644 --- a/decidim-forms/app/cells/decidim/forms/question_readonly/show.erb +++ b/decidim-forms/app/cells/decidim/forms/question_readonly/show.erb @@ -1,7 +1,7 @@

  • <%= translated_attribute(model.body) %> -
    +
    (<%= t(model.question_type, scope: "decidim.forms.question_types") %>) diff --git a/decidim-initiatives/app/cells/decidim/initiatives_votes/vote/show.erb b/decidim-initiatives/app/cells/decidim/initiatives_votes/vote/show.erb index 56ece4b72b09..6f49e5c8a84b 100644 --- a/decidim-initiatives/app/cells/decidim/initiatives_votes/vote/show.erb +++ b/decidim-initiatives/app/cells/decidim/initiatives_votes/vote/show.erb @@ -1,4 +1,4 @@ -
    +

    <%= initiative_id %> diff --git a/decidim-initiatives/app/views/decidim/initiatives/admin/initiatives/export_pdf_signatures.pdf.erb b/decidim-initiatives/app/views/decidim/initiatives/admin/initiatives/export_pdf_signatures.pdf.erb index 7f2f61e336b9..4bf5a8688ab4 100644 --- a/decidim-initiatives/app/views/decidim/initiatives/admin/initiatives/export_pdf_signatures.pdf.erb +++ b/decidim-initiatives/app/views/decidim/initiatives/admin/initiatives/export_pdf_signatures.pdf.erb @@ -37,8 +37,8 @@
    • -
    -
    +
    +
    diff --git a/decidim-initiatives/app/views/decidim/initiatives/admin/initiatives/show.html.erb b/decidim-initiatives/app/views/decidim/initiatives/admin/initiatives/show.html.erb index e0bea143c705..18d547affabd 100644 --- a/decidim-initiatives/app/views/decidim/initiatives/admin/initiatives/show.html.erb +++ b/decidim-initiatives/app/views/decidim/initiatives/admin/initiatives/show.html.erb @@ -75,7 +75,7 @@
    -

    +

    Membres de la comissió promotora de la iniciativa @@ -106,7 +106,7 @@ <%= decidim_sanitize translated_attribute(current_initiative.description) %>

    Exposició de motius:

    -




    +




    En cas de Consulta, especificar:

      @@ -161,7 +161,7 @@
    -
    +
    Lloc i data de la sol·licitud
    diff --git a/decidim-initiatives/app/views/decidim/initiatives/admin/initiatives_types/edit.html.erb b/decidim-initiatives/app/views/decidim/initiatives/admin/initiatives_types/edit.html.erb index eff97552ae5c..ee475fb7e1bc 100644 --- a/decidim-initiatives/app/views/decidim/initiatives/admin/initiatives_types/edit.html.erb +++ b/decidim-initiatives/app/views/decidim/initiatives/admin/initiatives_types/edit.html.erb @@ -10,6 +10,6 @@ data: { confirm: t(".confirm_destroy") } %> <% end %>
    -
    +
    <%= render partial: "initiative_type_scopes", locals: { initiative_type: current_initiative_type } %> <% end %> diff --git a/decidim-initiatives/app/views/decidim/initiatives/committee_requests/new.html.erb b/decidim-initiatives/app/views/decidim/initiatives/committee_requests/new.html.erb index fad7b1207196..48e6cef096fd 100644 --- a/decidim-initiatives/app/views/decidim/initiatives/committee_requests/new.html.erb +++ b/decidim-initiatives/app/views/decidim/initiatives/committee_requests/new.html.erb @@ -9,7 +9,7 @@ <% add_decidim_page_title(translated_attribute(current_initiative.title)) %> <% provide :meta_image_url, current_initiative.type.banner_image.url %> -

    +

    <%= translated_attribute(current_initiative.title) %>

    <%= render partial: "decidim/initiatives/initiatives/author", locals: { initiative: current_initiative } %> diff --git a/decidim-initiatives/app/views/decidim/initiatives/create_initiative/fill_data.html.erb b/decidim-initiatives/app/views/decidim/initiatives/create_initiative/fill_data.html.erb index db186b75c016..b133796df220 100644 --- a/decidim-initiatives/app/views/decidim/initiatives/create_initiative/fill_data.html.erb +++ b/decidim-initiatives/app/views/decidim/initiatives/create_initiative/fill_data.html.erb @@ -13,7 +13,7 @@
    -
    +
    diff --git a/decidim-initiatives/app/views/decidim/initiatives/create_initiative/finish.html.erb b/decidim-initiatives/app/views/decidim/initiatives/create_initiative/finish.html.erb index 42650a52655a..f1d5da6bd387 100644 --- a/decidim-initiatives/app/views/decidim/initiatives/create_initiative/finish.html.erb +++ b/decidim-initiatives/app/views/decidim/initiatives/create_initiative/finish.html.erb @@ -13,7 +13,7 @@
    -
    +
    diff --git a/decidim-initiatives/app/views/decidim/initiatives/create_initiative/previous_form.html.erb b/decidim-initiatives/app/views/decidim/initiatives/create_initiative/previous_form.html.erb index e545663a4ff3..5889e97bab5f 100644 --- a/decidim-initiatives/app/views/decidim/initiatives/create_initiative/previous_form.html.erb +++ b/decidim-initiatives/app/views/decidim/initiatives/create_initiative/previous_form.html.erb @@ -13,7 +13,7 @@
    -
    +
    diff --git a/decidim-initiatives/app/views/decidim/initiatives/create_initiative/promotal_committee.html.erb b/decidim-initiatives/app/views/decidim/initiatives/create_initiative/promotal_committee.html.erb index 19a509ac7b01..6e10093b8f22 100644 --- a/decidim-initiatives/app/views/decidim/initiatives/create_initiative/promotal_committee.html.erb +++ b/decidim-initiatives/app/views/decidim/initiatives/create_initiative/promotal_committee.html.erb @@ -13,7 +13,7 @@
    -
    +
    <%= render partial: "share_committee_link" %> diff --git a/decidim-initiatives/app/views/decidim/initiatives/create_initiative/select_initiative_type.html.erb b/decidim-initiatives/app/views/decidim/initiatives/create_initiative/select_initiative_type.html.erb index 2dfd33509e0f..914db7190bf6 100644 --- a/decidim-initiatives/app/views/decidim/initiatives/create_initiative/select_initiative_type.html.erb +++ b/decidim-initiatives/app/views/decidim/initiatives/create_initiative/select_initiative_type.html.erb @@ -12,7 +12,7 @@ <%= link_to t(".more_information"), decidim.page_path("initiatives"), target: "_blank" %>.
    -
    +
    @@ -39,7 +39,7 @@
    <%= raw translated_attribute type.description %>
    -
    +
    <%= decidim_form_for(@form, url: next_wizard_path, method: :put, html: { id: "new_initiative_#{type.id}", class: "form select-initiative_type-form" }) do |f| %> <%= f.hidden_field :type_id, value: type.id, id: "initiative_type_id_#{ type.id }" %> <%= f.submit t(".select"), class: "button" %> diff --git a/decidim-initiatives/app/views/decidim/initiatives/create_initiative/show_similar_initiatives.html.erb b/decidim-initiatives/app/views/decidim/initiatives/create_initiative/show_similar_initiatives.html.erb index 66084dfa287b..9d2a228f64bf 100644 --- a/decidim-initiatives/app/views/decidim/initiatives/create_initiative/show_similar_initiatives.html.erb +++ b/decidim-initiatives/app/views/decidim/initiatives/create_initiative/show_similar_initiatives.html.erb @@ -10,7 +10,7 @@ <%= link_to t(".more_information"), decidim.page_path("initiatives"), target: "_blank" %>.
    -
    +
    <%= render similar_initiatives %> diff --git a/decidim-initiatives/app/views/decidim/initiatives/initiative_signatures/finish.html.erb b/decidim-initiatives/app/views/decidim/initiatives/initiative_signatures/finish.html.erb index dc150c8c2189..45a7f3527011 100644 --- a/decidim-initiatives/app/views/decidim/initiatives/initiative_signatures/finish.html.erb +++ b/decidim-initiatives/app/views/decidim/initiatives/initiative_signatures/finish.html.erb @@ -10,7 +10,7 @@ <%= render partial: "wizard_steps" %>
    -
    +
    <%= link_to t(".back_to_initiative"), initiative_path(current_initiative), class: "button white-button expanded" %>
    diff --git a/decidim-initiatives/app/views/decidim/initiatives/initiatives/_result.html.erb b/decidim-initiatives/app/views/decidim/initiatives/initiatives/_result.html.erb index 6fdf9f851278..6110e617ef84 100644 --- a/decidim-initiatives/app/views/decidim/initiatives/initiatives/_result.html.erb +++ b/decidim-initiatives/app/views/decidim/initiatives/initiatives/_result.html.erb @@ -1,5 +1,5 @@ <% if initiative.answered? && translated_attribute(initiative.answer).present? %> -
    +
    <%= t(initiative.state, scope: "decidim.initiatives.initiatives.result.answer_title") %>:
    @@ -17,7 +17,7 @@ <% end %> <% if initiative.rejected? %> -
    +
    <%= t(".initiative_rejected_reason") %>
    diff --git a/decidim-initiatives/app/views/decidim/initiatives/initiatives/show.html.erb b/decidim-initiatives/app/views/decidim/initiatives/initiatives/show.html.erb index 8cd903f9a172..1957b26171e3 100644 --- a/decidim-initiatives/app/views/decidim/initiatives/initiatives/show.html.erb +++ b/decidim-initiatives/app/views/decidim/initiatives/initiatives/show.html.erb @@ -64,7 +64,7 @@ edit_link( <%= render partial: "author", locals: { initiative: current_initiative } %>
    -
    +
    <%= render partial: "initiative_badge", locals: { initiative: current_initiative } %> <%= decidim_sanitize translated_attribute(current_initiative.description) %> diff --git a/decidim-initiatives/app/views/decidim/initiatives/initiatives/signature_identities.html.erb b/decidim-initiatives/app/views/decidim/initiatives/initiatives/signature_identities.html.erb index 32a69221bbe9..081fbe0be1a2 100644 --- a/decidim-initiatives/app/views/decidim/initiatives/initiatives/signature_identities.html.erb +++ b/decidim-initiatives/app/views/decidim/initiatives/initiatives/signature_identities.html.erb @@ -12,7 +12,7 @@ } unless current_initiative.offline? %> <% Decidim::UserGroups::ManageableUserGroups.for(current_user).verified.each do |g| %> -
    +
    <% if @voted_groups.include? g.id %> <%= button_to( g.name, diff --git a/decidim-initiatives/app/views/decidim/initiatives/initiatives_mailer/notify_creation.html.erb b/decidim-initiatives/app/views/decidim/initiatives/initiatives_mailer/notify_creation.html.erb index 506f3711b3c3..fc7217dcf519 100644 --- a/decidim-initiatives/app/views/decidim/initiatives/initiatives_mailer/notify_creation.html.erb +++ b/decidim-initiatives/app/views/decidim/initiatives/initiatives_mailer/notify_creation.html.erb @@ -13,7 +13,7 @@ decidim_initiatives.new_initiative_committee_request_url(@initiative, host: @organization.host) %>

    <% end %> -

    +

    <%= t("check_initiative_details", scope: "decidim.initiatives.initiatives_mailer.initiative_link") %> diff --git a/decidim-initiatives/app/views/decidim/initiatives/initiatives_mailer/notify_progress.html.erb b/decidim-initiatives/app/views/decidim/initiatives/initiatives_mailer/notify_progress.html.erb index 4200f74bc1ca..224d4e3c6c02 100644 --- a/decidim-initiatives/app/views/decidim/initiatives/initiatives_mailer/notify_progress.html.erb +++ b/decidim-initiatives/app/views/decidim/initiatives/initiatives_mailer/notify_progress.html.erb @@ -1,3 +1,3 @@ <%= decidim_sanitize @body %> -

    +

    <%= render partial: "initiative_link" %> diff --git a/decidim-initiatives/app/views/decidim/initiatives/initiatives_mailer/notify_state_change.html.erb b/decidim-initiatives/app/views/decidim/initiatives/initiatives_mailer/notify_state_change.html.erb index 4200f74bc1ca..224d4e3c6c02 100644 --- a/decidim-initiatives/app/views/decidim/initiatives/initiatives_mailer/notify_state_change.html.erb +++ b/decidim-initiatives/app/views/decidim/initiatives/initiatives_mailer/notify_state_change.html.erb @@ -1,3 +1,3 @@ <%= decidim_sanitize @body %> -

    +

    <%= render partial: "initiative_link" %> diff --git a/decidim-initiatives/app/views/decidim/initiatives/initiatives_mailer/notify_validating_request.html.erb b/decidim-initiatives/app/views/decidim/initiatives/initiatives_mailer/notify_validating_request.html.erb index 4200f74bc1ca..224d4e3c6c02 100644 --- a/decidim-initiatives/app/views/decidim/initiatives/initiatives_mailer/notify_validating_request.html.erb +++ b/decidim-initiatives/app/views/decidim/initiatives/initiatives_mailer/notify_validating_request.html.erb @@ -1,3 +1,3 @@ <%= decidim_sanitize @body %> -

    +

    <%= render partial: "initiative_link" %> diff --git a/decidim-initiatives/app/views/layouts/decidim/admin/initiatives_votes.pdf.erb b/decidim-initiatives/app/views/layouts/decidim/admin/initiatives_votes.pdf.erb index 1b9f07de70b1..51ca81fe0f86 100644 --- a/decidim-initiatives/app/views/layouts/decidim/admin/initiatives_votes.pdf.erb +++ b/decidim-initiatives/app/views/layouts/decidim/admin/initiatives_votes.pdf.erb @@ -1,8 +1,8 @@ - - + + <%= wicked_pdf_stylesheet_link_tag "decidim/initiatives/initiatives-votes" %> diff --git a/decidim-meetings/app/cells/decidim/meetings/meetings_map/show.erb b/decidim-meetings/app/cells/decidim/meetings/meetings_map/show.erb index 72351b57132b..2012a7dffa1a 100644 --- a/decidim-meetings/app/cells/decidim/meetings/meetings_map/show.erb +++ b/decidim-meetings/app/cells/decidim/meetings/meetings_map/show.erb @@ -14,8 +14,8 @@

    {{html icon}}
    - {{html location}}
    - ${address}
    + {{html location}}
    + ${address}
    {{html locationHints}}
    diff --git a/decidim-meetings/app/views/decidim/meetings/_calendar_modal.html.erb b/decidim-meetings/app/views/decidim/meetings/_calendar_modal.html.erb index e8e291d98dee..dfdeb3d4c924 100644 --- a/decidim-meetings/app/views/decidim/meetings/_calendar_modal.html.erb +++ b/decidim-meetings/app/views/decidim/meetings/_calendar_modal.html.erb @@ -9,5 +9,5 @@
    - " readonly /> + " readonly>
    diff --git a/decidim-meetings/app/views/decidim/meetings/admin/meetings/index.html.erb b/decidim-meetings/app/views/decidim/meetings/admin/meetings/index.html.erb index 83259e2b8cd1..739383758030 100644 --- a/decidim-meetings/app/views/decidim/meetings/admin/meetings/index.html.erb +++ b/decidim-meetings/app/views/decidim/meetings/admin/meetings/index.html.erb @@ -28,7 +28,7 @@ <% meetings.each do |meeting| %> - <%= present(meeting).title %>
    + <%= present(meeting).title %>
    <% if meeting.start_time %> diff --git a/decidim-meetings/app/views/decidim/meetings/meetings/_meeting_agenda.html.erb b/decidim-meetings/app/views/decidim/meetings/meetings/_meeting_agenda.html.erb index a776ce83aec9..f21a8aca29f4 100644 --- a/decidim-meetings/app/views/decidim/meetings/meetings/_meeting_agenda.html.erb +++ b/decidim-meetings/app/views/decidim/meetings/meetings/_meeting_agenda.html.erb @@ -10,7 +10,7 @@ <%= translated_attribute(agenda_item.title) %>  <%= display_duration_agenda_items(agenda_item.id, index, agenda_items_times) %> -
    +

    <%= translated_attribute(agenda_item.description).html_safe %>

    <% if agenda_item.agenda_item_children.presence %> diff --git a/decidim-meetings/app/views/decidim/participatory_spaces/_conference_venues.html.erb b/decidim-meetings/app/views/decidim/participatory_spaces/_conference_venues.html.erb index 28f2f07e7253..bc96f2a1f03e 100644 --- a/decidim-meetings/app/views/decidim/participatory_spaces/_conference_venues.html.erb +++ b/decidim-meetings/app/views/decidim/participatory_spaces/_conference_venues.html.erb @@ -1,5 +1,5 @@ <% if meetings.any? %> -
    +

    <%= t("conference_venues", scope: "decidim.meetings") %>

    diff --git a/decidim-participatory_processes/app/cells/decidim/participatory_processes/process_m/data.erb b/decidim-participatory_processes/app/cells/decidim/participatory_processes/process_m/data.erb index 035e78ee2047..ce7e1834ab16 100644 --- a/decidim-participatory_processes/app/cells/decidim/participatory_processes/process_m/data.erb +++ b/decidim-participatory_processes/app/cells/decidim/participatory_processes/process_m/data.erb @@ -6,14 +6,14 @@
  • <%= t("activemodel.attributes.participatory_process.start_date") %> -
    +
    <%= start_date ? l(start_date, format: :decidim_short) : t("decidim.participatory_processes.show.unspecified") %>
  • <%= t("activemodel.attributes.participatory_process.end_date") %> -
    +
    <%= end_date ? l(end_date, format: :decidim_short) : t("decidim.participatory_processes.show.unspecified") %>
    • diff --git a/decidim-participatory_processes/app/views/decidim/participatory_processes/admin/participatory_process_groups/index.html.erb b/decidim-participatory_processes/app/views/decidim/participatory_processes/admin/participatory_process_groups/index.html.erb index e242f89663bd..081c76da3547 100644 --- a/decidim-participatory_processes/app/views/decidim/participatory_processes/admin/participatory_process_groups/index.html.erb +++ b/decidim-participatory_processes/app/views/decidim/participatory_processes/admin/participatory_process_groups/index.html.erb @@ -19,7 +19,7 @@ <% if allowed_to? :update, :process_group, process_group: group %> - <%= link_to translated_attribute(group.name), ["edit", group] %>
    + <%= link_to translated_attribute(group.name), ["edit", group] %>
    <% else %> <%= translated_attribute(group.name) %> <% end %> diff --git a/decidim-participatory_processes/app/views/decidim/participatory_processes/admin/participatory_process_steps/index.html.erb b/decidim-participatory_processes/app/views/decidim/participatory_processes/admin/participatory_process_steps/index.html.erb index 650586ae1680..563d5239e0c6 100644 --- a/decidim-participatory_processes/app/views/decidim/participatory_processes/admin/participatory_process_steps/index.html.erb +++ b/decidim-participatory_processes/app/views/decidim/participatory_processes/admin/participatory_process_steps/index.html.erb @@ -28,7 +28,7 @@ <% if step.active? %> <% end %> - <%= link_to translated_attribute(step.title), edit_participatory_process_step_path(current_participatory_process, step) %>
    + <%= link_to translated_attribute(step.title), edit_participatory_process_step_path(current_participatory_process, step) %>
    <% if step.start_date %> diff --git a/decidim-participatory_processes/app/views/decidim/participatory_processes/admin/participatory_process_steps/show.html.erb b/decidim-participatory_processes/app/views/decidim/participatory_processes/admin/participatory_process_steps/show.html.erb index e79c03549b3d..bcf4710efa32 100644 --- a/decidim-participatory_processes/app/views/decidim/participatory_processes/admin/participatory_process_steps/show.html.erb +++ b/decidim-participatory_processes/app/views/decidim/participatory_processes/admin/participatory_process_steps/show.html.erb @@ -1,7 +1,7 @@

    <%= translated_attribute(@participatory_process_step.title) %>

    -
    +
    <%= link_to t("decidim.admin.actions.edit"), edit_participatory_process_step_path(participatory_process, @participatory_process_step) if allowed_to? :update, :process_step, process_step: @participatory_process_step %> <%= link_to t("decidim.admin.actions.destroy"), participatory_process_step_path(participatory_process, @participatory_process_step), method: :delete, class: "alert button", data: { confirm: t("decidim.admin.actions.confirm_destroy") } if allowed_to? :destroy, :process_step, process_step: @participatory_process_step %>
    diff --git a/decidim-participatory_processes/app/views/decidim/participatory_processes/admin/participatory_process_user_roles/index.html.erb b/decidim-participatory_processes/app/views/decidim/participatory_processes/admin/participatory_process_user_roles/index.html.erb index 840eb76c2b8b..3382c6e362cb 100644 --- a/decidim-participatory_processes/app/views/decidim/participatory_processes/admin/participatory_process_user_roles/index.html.erb +++ b/decidim-participatory_processes/app/views/decidim/participatory_processes/admin/participatory_process_user_roles/index.html.erb @@ -25,10 +25,10 @@ <% @participatory_process_user_roles.each do |role| %> - <%= role.user.name %>
    + <%= role.user.name %>
    - <%= role.user.email %>
    + <%= role.user.email %>
    <% if role.user.invitation_sent_at %> @@ -41,7 +41,7 @@ <% end %> - <%= t("#{role.role}", scope: "decidim.admin.models.participatory_process_user_role.roles") %>
    + <%= t("#{role.role}", scope: "decidim.admin.models.participatory_process_user_role.roles") %>
    <% if allowed_to?(:invite, :process_user_role, user_role: role) && role.user.invited_to_sign_up? %> diff --git a/decidim-participatory_processes/app/views/decidim/participatory_processes/admin/participatory_processes/index.html.erb b/decidim-participatory_processes/app/views/decidim/participatory_processes/admin/participatory_processes/index.html.erb index 1648fd5e3d6d..83210c02ff51 100644 --- a/decidim-participatory_processes/app/views/decidim/participatory_processes/admin/participatory_processes/index.html.erb +++ b/decidim-participatory_processes/app/views/decidim/participatory_processes/admin/participatory_processes/index.html.erb @@ -61,11 +61,11 @@ <% end %> <% if allowed_to? :update, :process, process: process %> - <%= link_to translated_attribute(process.title), edit_participatory_process_path(process) %>
    + <%= link_to translated_attribute(process.title), edit_participatory_process_path(process) %>
    <% elsif allowed_to? :preview, :process, process: process %> - <%= link_to translated_attribute(process.title), decidim_participatory_processes.participatory_process_path(process) %>
    + <%= link_to translated_attribute(process.title), decidim_participatory_processes.participatory_process_path(process) %>
    <% elsif allowed_to? :read, :moderation, process: process %> - <%= link_to translated_attribute(process.title), moderations_path(process) %>
    + <%= link_to translated_attribute(process.title), moderations_path(process) %>
    <% else %> <%= translated_attribute(process.title) %> <% end %> diff --git a/decidim-proposals/app/views/decidim/proposals/admin/proposals/_proposal-tr.html.erb b/decidim-proposals/app/views/decidim/proposals/admin/proposals/_proposal-tr.html.erb index 9addf3bc87b7..dfb886bca28f 100644 --- a/decidim-proposals/app/views/decidim/proposals/admin/proposals/_proposal-tr.html.erb +++ b/decidim-proposals/app/views/decidim/proposals/admin/proposals/_proposal-tr.html.erb @@ -1,12 +1,12 @@ - <%= check_box_tag "proposal_ids_s[]", proposal.id, false, class: "js-check-all-proposal js-proposal-list-check js-proposal-id-#{proposal.id}" %>
    + <%= check_box_tag "proposal_ids_s[]", proposal.id, false, class: "js-check-all-proposal js-proposal-list-check js-proposal-id-#{proposal.id}" %>
    - <%= proposal.id %>
    + <%= proposal.id %>
    - <%= decidim_html_escape(present(proposal).title).html_safe %>
    + <%= decidim_html_escape(present(proposal).title).html_safe %>
    <% if proposal.category %> diff --git a/decidim-proposals/app/views/decidim/proposals/proposals/_proposal_preview.html.erb b/decidim-proposals/app/views/decidim/proposals/proposals/_proposal_preview.html.erb index f63d9a578c71..5e430babcadc 100644 --- a/decidim-proposals/app/views/decidim/proposals/proposals/_proposal_preview.html.erb +++ b/decidim-proposals/app/views/decidim/proposals/proposals/_proposal_preview.html.erb @@ -7,5 +7,5 @@
    <%= simple_format present(@proposal).body(links: true, strip_tags: true) %>
    -
    +
    <%= attachments_for(@proposal) %> diff --git a/decidim-proposals/app/views/decidim/proposals/proposals/index.html.erb b/decidim-proposals/app/views/decidim/proposals/proposals/index.html.erb index cd4dc0606488..8632ecd79ac1 100644 --- a/decidim-proposals/app/views/decidim/proposals/proposals/index.html.erb +++ b/decidim-proposals/app/views/decidim/proposals/proposals/index.html.erb @@ -11,7 +11,7 @@
    {{html icon}}
    - ${address}
    + ${address}
    diff --git a/decidim-proposals/app/views/decidim/proposals/proposals/participatory_texts/_index.html.erb b/decidim-proposals/app/views/decidim/proposals/proposals/participatory_texts/_index.html.erb index 09cf5bc39bfe..aa071e23e4f3 100644 --- a/decidim-proposals/app/views/decidim/proposals/proposals/participatory_texts/_index.html.erb +++ b/decidim-proposals/app/views/decidim/proposals/proposals/participatory_texts/_index.html.erb @@ -10,7 +10,7 @@ <% else %> <%= decidim_html_escape(present(proposal).title).html_safe %> <% end %> -
    +
    <% end %>

    diff --git a/decidim-proposals/app/views/decidim/proposals/proposals/show.html.erb b/decidim-proposals/app/views/decidim/proposals/proposals/show.html.erb index a92313766927..42d4bdc2d334 100644 --- a/decidim-proposals/app/views/decidim/proposals/proposals/show.html.erb +++ b/decidim-proposals/app/views/decidim/proposals/proposals/show.html.erb @@ -79,7 +79,7 @@ edit_link( <%= render partial: "vote_button", locals: { proposal: @proposal, from_proposals_list: false } %> <% end %> <%= render partial: "endorsements_card_row", locals: { proposal: @proposal } %> -
    +
    <%= follow_button_for(@proposal) %>
    diff --git a/decidim-sortitions/app/views/decidim/sortitions/sortitions/show.html.erb b/decidim-sortitions/app/views/decidim/sortitions/sortitions/show.html.erb index 1e10a4d316ba..7e1fb03753ed 100644 --- a/decidim-sortitions/app/views/decidim/sortitions/sortitions/show.html.erb +++ b/decidim-sortitions/app/views/decidim/sortitions/sortitions/show.html.erb @@ -101,7 +101,7 @@
    - <%= t ".algorithm" %>
    + <%= t ".algorithm" %>
    <%= link_to Decidim::Sortitions.sortition_algorithm, Decidim::Sortitions.sortition_algorithm, diff --git a/decidim-system/app/views/decidim/system/admins/index.html.erb b/decidim-system/app/views/decidim/system/admins/index.html.erb index 45927a187b0d..62ab40295ae1 100644 --- a/decidim-system/app/views/decidim/system/admins/index.html.erb +++ b/decidim-system/app/views/decidim/system/admins/index.html.erb @@ -18,7 +18,7 @@ <% @admins.each do |admin| %> - <%= link_to admin.email, admin %>
    + <%= link_to admin.email, admin %>
    <%= l admin.created_at, format: :short %> diff --git a/decidim-system/app/views/decidim/system/admins/show.html.erb b/decidim-system/app/views/decidim/system/admins/show.html.erb index 7f869d1d9491..14cff271c63c 100644 --- a/decidim-system/app/views/decidim/system/admins/show.html.erb +++ b/decidim-system/app/views/decidim/system/admins/show.html.erb @@ -3,7 +3,7 @@ <% end %>
    -
    +
    <%= link_to "Edit", ["edit", @admin] %> <%= link_to "Destroy", @admin, method: :delete, class: "alert button", data: { confirm: "Are you sure you want to do this?" } %>
    diff --git a/decidim-system/app/views/decidim/system/devise/passwords/edit.html.erb b/decidim-system/app/views/decidim/system/devise/passwords/edit.html.erb index 5c7a2916a4a2..15c9a5f1d427 100644 --- a/decidim-system/app/views/decidim/system/devise/passwords/edit.html.erb +++ b/decidim-system/app/views/decidim/system/devise/passwords/edit.html.erb @@ -6,7 +6,7 @@
    <% if @minimum_password_length %> - (<%= @minimum_password_length %> characters minimum)
    + (<%= @minimum_password_length %> characters minimum)
    <% end %> <%= f.password_field :password, autofocus: true, autocomplete: "off" %>
    diff --git a/decidim-system/app/views/decidim/system/devise/shared/_links.html.erb b/decidim-system/app/views/decidim/system/devise/shared/_links.html.erb index e6a3e4196944..89dce9d71d0c 100644 --- a/decidim-system/app/views/decidim/system/devise/shared/_links.html.erb +++ b/decidim-system/app/views/decidim/system/devise/shared/_links.html.erb @@ -1,25 +1,25 @@ <%- if controller_name != 'sessions' %> - <%= link_to "Log in", new_session_path(resource_name) %>
    + <%= link_to "Log in", new_session_path(resource_name) %>
    <% end -%> <%- if devise_mapping.registerable? && controller_name != 'registrations' %> - <%= link_to "Sign up", new_registration_path(resource_name) %>
    + <%= link_to "Sign up", new_registration_path(resource_name) %>
    <% end -%> <%- if devise_mapping.recoverable? && controller_name != 'passwords' && controller_name != 'registrations' %> - <%= link_to "Forgot your password?", new_password_path(resource_name) %>
    + <%= link_to "Forgot your password?", new_password_path(resource_name) %>
    <% end -%> <%- if devise_mapping.confirmable? && controller_name != 'confirmations' %> - <%= link_to "Didn't receive confirmation instructions?", new_confirmation_path(resource_name) %>
    + <%= link_to "Didn't receive confirmation instructions?", new_confirmation_path(resource_name) %>
    <% end -%> <%- if devise_mapping.lockable? && resource_class.unlock_strategy_enabled?(:email) && controller_name != 'unlocks' %> - <%= link_to "Didn't receive unlock instructions?", new_unlock_path(resource_name) %>
    + <%= link_to "Didn't receive unlock instructions?", new_unlock_path(resource_name) %>
    <% end -%> <%- if devise_mapping.omniauthable? %> <%- resource_class.omniauth_providers.each do |provider| %> - <%= link_to "Sign in with #{OmniAuth::Utils.camelize(provider)}", omniauth_authorize_path(resource_name, provider) %>
    + <%= link_to "Sign in with #{OmniAuth::Utils.camelize(provider)}", omniauth_authorize_path(resource_name, provider) %>
    <% end -%> <% end -%> diff --git a/decidim-system/app/views/decidim/system/organizations/index.html.erb b/decidim-system/app/views/decidim/system/organizations/index.html.erb index 17b386378bce..2b20de9314ee 100644 --- a/decidim-system/app/views/decidim/system/organizations/index.html.erb +++ b/decidim-system/app/views/decidim/system/organizations/index.html.erb @@ -18,7 +18,7 @@ <% @organizations.each do |organization| %> - <%= link_to organization.name, organization %>
    + <%= link_to organization.name, organization %>
    <%= organization.host %> diff --git a/decidim-system/app/views/decidim/system/organizations/show.html.erb b/decidim-system/app/views/decidim/system/organizations/show.html.erb index a83ff7c15469..264ed876f5e0 100644 --- a/decidim-system/app/views/decidim/system/organizations/show.html.erb +++ b/decidim-system/app/views/decidim/system/organizations/show.html.erb @@ -5,7 +5,7 @@ <% end %>
    -
    +
    <%= link_to t("decidim.system.actions.edit"), ["edit", @organization] %> <%= link_to t("decidim.system.actions.destroy"), @organization, method: :delete, class: "alert button", data: { confirm: t("decidim.system.actions.confirm_destroy") } %>
    diff --git a/decidim-system/app/views/layouts/decidim/system/_header.html.erb b/decidim-system/app/views/layouts/decidim/system/_header.html.erb index 33e33a0ba252..fa99b12ff066 100644 --- a/decidim-system/app/views/layouts/decidim/system/_header.html.erb +++ b/decidim-system/app/views/layouts/decidim/system/_header.html.erb @@ -1,4 +1,4 @@ - + <%= csrf_meta_tags %> <%= stylesheet_link_tag "decidim/system/application", media: "all" %> <%= javascript_include_tag "decidim/system/application" %> diff --git a/decidim_app-design/app/views/admin/component-meetings-add-item.html.erb b/decidim_app-design/app/views/admin/component-meetings-add-item.html.erb index dd98a7e08bba..9ed30aaa8bd7 100644 --- a/decidim_app-design/app/views/admin/component-meetings-add-item.html.erb +++ b/decidim_app-design/app/views/admin/component-meetings-add-item.html.erb @@ -50,7 +50,7 @@ <% end %> <% content_for :content, flush: true do %> - + <% end %> <%= render layout: "admin/components/lang-tabs" do %><% end %>
    @@ -58,7 +58,7 @@
    - +  minutes
    @@ -78,7 +78,7 @@
    - +
    diff --git a/decidim_app-design/app/views/admin/component-meetings-edit-errors.html.erb b/decidim_app-design/app/views/admin/component-meetings-edit-errors.html.erb index 507125fde2ae..23b8279ece6d 100644 --- a/decidim_app-design/app/views/admin/component-meetings-edit-errors.html.erb +++ b/decidim_app-design/app/views/admin/component-meetings-edit-errors.html.erb @@ -54,7 +54,7 @@ <% end %> <% content_for :content, flush: true do %> - + <% end %> <%= render layout: "admin/components/lang-tabs" do %><% end %>
    @@ -62,7 +62,7 @@
    - +  minutes
    @@ -82,7 +82,7 @@
    - +
    @@ -134,7 +134,7 @@ <% end %> <% content_for :content, flush: true do %> - + <% end %> <%= render layout: "admin/components/lang-tabs" do %><% end %>
    @@ -142,7 +142,7 @@
    - +  minutes
    @@ -162,7 +162,7 @@
    - +
    diff --git a/decidim_app-design/app/views/admin/component-meetings-edit-item.html.erb b/decidim_app-design/app/views/admin/component-meetings-edit-item.html.erb index d91e080bc976..41d9dd702ef1 100644 --- a/decidim_app-design/app/views/admin/component-meetings-edit-item.html.erb +++ b/decidim_app-design/app/views/admin/component-meetings-edit-item.html.erb @@ -31,7 +31,7 @@ <% end %> <% content_for :content, flush: true do %> - + <% end %> <%= render layout: "admin/components/lang-tabs" do %><% end %>
    @@ -39,7 +39,7 @@
    - +  minutes
    @@ -59,7 +59,7 @@
    - +
    diff --git a/decidim_app-design/app/views/admin/component-meetings-initial.html.erb b/decidim_app-design/app/views/admin/component-meetings-initial.html.erb index 51d96efb4132..556bccaa2042 100644 --- a/decidim_app-design/app/views/admin/component-meetings-initial.html.erb +++ b/decidim_app-design/app/views/admin/component-meetings-initial.html.erb @@ -24,7 +24,7 @@ <% end %> <% content_for :content, flush: true do %> - + <% end %> <%= render layout: "admin/components/lang-tabs" do %><% end %>
    @@ -43,7 +43,7 @@
    - +
    @@ -52,7 +52,7 @@ <% end %> <% content_for :content, flush: true do %> - + <% end %> <%= render layout: "admin/components/lang-tabs" do %><% end %>
    @@ -63,7 +63,7 @@ <% end %> <% content_for :content, flush: true do %> - + <% end %> <%= render layout: "admin/components/lang-tabs" do %><% end %>
    @@ -71,11 +71,11 @@
    - " /> + ">
    - " /> + ">
    diff --git a/decidim_app-design/app/views/admin/component-meetings-items.html.erb b/decidim_app-design/app/views/admin/component-meetings-items.html.erb index 416bf1fed2cc..e49c7c7cb6fa 100644 --- a/decidim_app-design/app/views/admin/component-meetings-items.html.erb +++ b/decidim_app-design/app/views/admin/component-meetings-items.html.erb @@ -50,7 +50,7 @@ <% end %> <% content_for :content, flush: true do %> - + <% end %> <%= render layout: "admin/components/lang-tabs" do %><% end %>
    @@ -58,7 +58,7 @@
    - +  minutes
    @@ -78,7 +78,7 @@
    - +
    @@ -129,7 +129,7 @@ <% end %> <% content_for :content, flush: true do %> - + <% end %> <%= render layout: "admin/components/lang-tabs" do %><% end %>
    @@ -137,7 +137,7 @@
    - +  minutes
    @@ -157,7 +157,7 @@
    - +
    diff --git a/decidim_app-design/app/views/admin/component-meetings-minutes-edit.html.erb b/decidim_app-design/app/views/admin/component-meetings-minutes-edit.html.erb index 0813f210b963..5e490b538a45 100644 --- a/decidim_app-design/app/views/admin/component-meetings-minutes-edit.html.erb +++ b/decidim_app-design/app/views/admin/component-meetings-minutes-edit.html.erb @@ -59,11 +59,11 @@
    - +
    - +
    diff --git a/decidim_app-design/app/views/admin/component-meetings-minutes.html.erb b/decidim_app-design/app/views/admin/component-meetings-minutes.html.erb index 6ded848cf703..0a6ae8ba7141 100644 --- a/decidim_app-design/app/views/admin/component-meetings-minutes.html.erb +++ b/decidim_app-design/app/views/admin/component-meetings-minutes.html.erb @@ -28,7 +28,7 @@ - + @@ -40,7 +40,7 @@ <% 5.times do %> - + @@ -74,7 +74,7 @@
    Título Fecha Agenda
    <%= Faker::FamilyGuy.quote %> <%= Faker::Date.forward(1).strftime("%d/%m/%y") %> — <%= Faker::Time.forward(1).strftime("%R") %> - <%= Faker::Time.forward(1).strftime("%R") %> Gestionar
    - + @@ -85,7 +85,7 @@ <% 5.times do %> - + diff --git a/decidim_app-design/app/views/admin/component-meetings-with-content.html.erb b/decidim_app-design/app/views/admin/component-meetings-with-content.html.erb index 1eb3d44b12da..312474b430c2 100644 --- a/decidim_app-design/app/views/admin/component-meetings-with-content.html.erb +++ b/decidim_app-design/app/views/admin/component-meetings-with-content.html.erb @@ -24,7 +24,7 @@ <% end %> <% content_for :content, flush: true do %> - + <% end %> <%= render layout: "admin/components/lang-tabs" do %><% end %> @@ -43,7 +43,7 @@
    - +
    @@ -52,7 +52,7 @@ <% end %> <% content_for :content, flush: true do %> - + <% end %> <%= render layout: "admin/components/lang-tabs" do %><% end %>
    @@ -63,7 +63,7 @@ <% end %> <% content_for :content, flush: true do %> - + <% end %> <%= render layout: "admin/components/lang-tabs" do %><% end %> @@ -71,11 +71,11 @@
    - " /> + ">
    - " /> + ">
    diff --git a/decidim_app-design/app/views/admin/component-proposals-actions.html.erb b/decidim_app-design/app/views/admin/component-proposals-actions.html.erb index 1ae308072591..f4e475202690 100644 --- a/decidim_app-design/app/views/admin/component-proposals-actions.html.erb +++ b/decidim_app-design/app/views/admin/component-proposals-actions.html.erb @@ -37,7 +37,7 @@
    Título Fecha Agenda
    <%= Faker::FamilyGuy.quote %> <%= Faker::Date.forward(1).strftime("%d/%m/%y") %> — <%= Faker::Time.forward(1).strftime("%R") %> - <%= Faker::Time.forward(1).strftime("%R") %> Ver
    - + @@ -50,7 +50,7 @@ <% 6.times do %> - + diff --git a/decidim_app-design/app/views/admin/component-proposals-apply-action.html.erb b/decidim_app-design/app/views/admin/component-proposals-apply-action.html.erb index eea663ee1313..3102fc5c6d02 100644 --- a/decidim_app-design/app/views/admin/component-proposals-apply-action.html.erb +++ b/decidim_app-design/app/views/admin/component-proposals-apply-action.html.erb @@ -33,7 +33,7 @@
    id title categoría
    <%= Faker::Number.digit %> <%= Faker::FamilyGuy.quote %> <%= Faker::Food.dish %>
    - + @@ -46,7 +46,7 @@ <% 6.times do %> - + diff --git a/decidim_app-design/app/views/admin/component-proposals-none.html.erb b/decidim_app-design/app/views/admin/component-proposals-none.html.erb index 60e5eb5c1153..88fac298587a 100644 --- a/decidim_app-design/app/views/admin/component-proposals-none.html.erb +++ b/decidim_app-design/app/views/admin/component-proposals-none.html.erb @@ -29,7 +29,7 @@
    id title categoría
    <%= Faker::Number.digit %> <%= Faker::FamilyGuy.quote %> <%= Faker::Food.dish %>
    - + @@ -43,7 +43,7 @@ <% 6.times do %> - + diff --git a/decidim_app-design/app/views/admin/component-proposals-search.html.erb b/decidim_app-design/app/views/admin/component-proposals-search.html.erb index fff2b3cc1630..481a2df4890f 100644 --- a/decidim_app-design/app/views/admin/component-proposals-search.html.erb +++ b/decidim_app-design/app/views/admin/component-proposals-search.html.erb @@ -29,7 +29,7 @@
    id title
    <%= Faker::Number.digit %> <%= Faker::FamilyGuy.quote %> <%= Faker::Food.dish %>
    - + @@ -42,7 +42,7 @@ <% 6.times do %> - + diff --git a/decidim_app-design/app/views/admin/component-proposals-selected.html.erb b/decidim_app-design/app/views/admin/component-proposals-selected.html.erb index 8351c2f87992..2a3b62a3c59d 100644 --- a/decidim_app-design/app/views/admin/component-proposals-selected.html.erb +++ b/decidim_app-design/app/views/admin/component-proposals-selected.html.erb @@ -30,7 +30,7 @@
    id title categoría
    <%= Faker::Number.digit %> <%= Faker::FamilyGuy.quote %> <%= Faker::Food.dish %>
    - + @@ -43,7 +43,7 @@ <% 3.times do %> - + @@ -54,7 +54,7 @@ <% end %> - + @@ -65,7 +65,7 @@ <% 2.times do %> - + diff --git a/decidim_app-design/app/views/admin/form-with-datepicker.html.erb b/decidim_app-design/app/views/admin/form-with-datepicker.html.erb index a7344600a160..6516e92f9a28 100644 --- a/decidim_app-design/app/views/admin/form-with-datepicker.html.erb +++ b/decidim_app-design/app/views/admin/form-with-datepicker.html.erb @@ -30,7 +30,7 @@
    - + Por favor, selecciona una fecha de inicio. diff --git a/decidim_app-design/app/views/admin/form-with-validation.html.erb b/decidim_app-design/app/views/admin/form-with-validation.html.erb index 354e5fce749e..d03b01ed1668 100644 --- a/decidim_app-design/app/views/admin/form-with-validation.html.erb +++ b/decidim_app-design/app/views/admin/form-with-validation.html.erb @@ -34,13 +34,13 @@
    - +
    - +
    - +
    @@ -68,13 +68,13 @@
    - +
    - +
    - +
    @@ -99,7 +99,7 @@
    @@ -156,7 +156,7 @@
    - + Por favor, selecciona una fecha de inicio. diff --git a/decidim_app-design/app/views/admin/partials/_filter_table.html.erb b/decidim_app-design/app/views/admin/partials/_filter_table.html.erb index dee64398e19e..c629df4b41d6 100644 --- a/decidim_app-design/app/views/admin/partials/_filter_table.html.erb +++ b/decidim_app-design/app/views/admin/partials/_filter_table.html.erb @@ -11,7 +11,7 @@
    - +
    diff --git a/decidim_app-design/app/views/admin/participatory-texts.html.erb b/decidim_app-design/app/views/admin/participatory-texts.html.erb index 67e8b2158605..c5a4798417a9 100644 --- a/decidim_app-design/app/views/admin/participatory-texts.html.erb +++ b/decidim_app-design/app/views/admin/participatory-texts.html.erb @@ -22,7 +22,7 @@ <% end %> <% content_for :content, flush: true do %> - + <% end %> <%= render layout: "admin/components/lang-tabs" do %><% end %>
    @@ -41,7 +41,7 @@
    - +
    diff --git a/decidim_app-design/app/views/admin/process-info.html.erb b/decidim_app-design/app/views/admin/process-info.html.erb index 9bd249cd1b52..6c4764767f28 100644 --- a/decidim_app-design/app/views/admin/process-info.html.erb +++ b/decidim_app-design/app/views/admin/process-info.html.erb @@ -31,13 +31,13 @@
    - +
    - +
    - +
    @@ -54,13 +54,13 @@
    - +
    - +
    - +
    @@ -68,19 +68,19 @@
    - +
    - +
    @@ -152,11 +152,11 @@
    - +
    - +
    @@ -174,13 +174,13 @@
    - +
    - +
    - +
    @@ -198,13 +198,13 @@
    - +
    - +
    - +
    @@ -224,13 +224,13 @@
    - +
    - +
    - +
    @@ -248,13 +248,13 @@
    - +
    - +
    - +
    @@ -273,13 +273,13 @@
    - +
    - +
    - +
    @@ -297,13 +297,13 @@
    - +
    - +
    - +
    diff --git a/decidim_app-design/app/views/admin/process-steps-new.html.erb b/decidim_app-design/app/views/admin/process-steps-new.html.erb index 874a5791bd2b..77c2cb66d1ad 100644 --- a/decidim_app-design/app/views/admin/process-steps-new.html.erb +++ b/decidim_app-design/app/views/admin/process-steps-new.html.erb @@ -31,13 +31,13 @@
    - +
    - +
    - +
    @@ -111,11 +111,11 @@
    - +
    - +
    diff --git a/decidim_app-design/app/views/admin/processes-new-2.html.erb b/decidim_app-design/app/views/admin/processes-new-2.html.erb index c2e6a02e9a09..eeb411566403 100644 --- a/decidim_app-design/app/views/admin/processes-new-2.html.erb +++ b/decidim_app-design/app/views/admin/processes-new-2.html.erb @@ -29,13 +29,13 @@
    - +
    - +
    - +
    @@ -107,11 +107,11 @@
    - +
    - +
    diff --git a/decidim_app-design/app/views/admin/processes-new-3-add.html.erb b/decidim_app-design/app/views/admin/processes-new-3-add.html.erb index c65f162013aa..07499fac9b6d 100644 --- a/decidim_app-design/app/views/admin/processes-new-3-add.html.erb +++ b/decidim_app-design/app/views/admin/processes-new-3-add.html.erb @@ -33,13 +33,13 @@
    - +
    - +
    - +
    @@ -64,7 +64,7 @@
    @@ -73,7 +73,7 @@
    - +
    @@ -101,7 +101,7 @@
    @@ -109,7 +109,7 @@
    @@ -119,7 +119,7 @@
    @@ -127,7 +127,7 @@
    @@ -146,7 +146,7 @@
    @@ -154,7 +154,7 @@
    @@ -164,7 +164,7 @@
    @@ -172,7 +172,7 @@
    @@ -191,7 +191,7 @@
    @@ -199,7 +199,7 @@
    @@ -209,7 +209,7 @@
    @@ -217,7 +217,7 @@
    @@ -275,13 +275,13 @@
    - +
    - +
    - +
    @@ -306,7 +306,7 @@
    @@ -315,7 +315,7 @@
    - +
    @@ -343,7 +343,7 @@
    @@ -351,7 +351,7 @@
    @@ -361,7 +361,7 @@
    @@ -369,7 +369,7 @@
    @@ -388,7 +388,7 @@
    @@ -396,7 +396,7 @@
    @@ -406,7 +406,7 @@
    @@ -414,7 +414,7 @@
    diff --git a/decidim_app-design/app/views/admin/processes-new.html.erb b/decidim_app-design/app/views/admin/processes-new.html.erb index 5789b3be6307..5c15d4eb0970 100644 --- a/decidim_app-design/app/views/admin/processes-new.html.erb +++ b/decidim_app-design/app/views/admin/processes-new.html.erb @@ -29,13 +29,13 @@
    - +
    - +
    - +
    @@ -52,13 +52,13 @@
    - +
    - +
    - +
    @@ -66,19 +66,19 @@
    - +
    - +
    @@ -152,22 +152,22 @@
    - +
    - +
    - +
    - +
    @@ -185,13 +185,13 @@
    - +
    - +
    - +
    @@ -208,13 +208,13 @@
    - +
    - +
    - +
    @@ -234,13 +234,13 @@
    - +
    - +
    - +
    @@ -258,13 +258,13 @@
    - +
    - +
    - +
    @@ -283,13 +283,13 @@
    - +
    - +
    - +
    @@ -307,13 +307,13 @@
    - +
    - +
    - +
    diff --git a/decidim_app-design/app/views/admin/scope-edit.html.erb b/decidim_app-design/app/views/admin/scope-edit.html.erb index fa46db71de9c..09efe4a5957e 100644 --- a/decidim_app-design/app/views/admin/scope-edit.html.erb +++ b/decidim_app-design/app/views/admin/scope-edit.html.erb @@ -16,12 +16,12 @@
    -
    +
    - +
    - +
    @@ -87,20 +87,20 @@
    - +
    - +
    - +
    - +
    diff --git a/decidim_app-design/app/views/layouts/admin.html.erb b/decidim_app-design/app/views/layouts/admin.html.erb index 20c748d61fea..6772ee7b883b 100644 --- a/decidim_app-design/app/views/layouts/admin.html.erb +++ b/decidim_app-design/app/views/layouts/admin.html.erb @@ -2,7 +2,7 @@ <%= @title || "Decidim Admin" %> - + <%= stylesheet_link_tag "admin", media: "all", 'data-turbolinks-track': "reload" %> <%= javascript_include_tag "admin", 'data-turbolinks-track': "reload" %> <%= favicon_link_tag "favicon.png" %> diff --git a/decidim_app-design/app/views/layouts/public.html.erb b/decidim_app-design/app/views/layouts/public.html.erb index 12825837b54a..4f4b7aeedc8e 100644 --- a/decidim_app-design/app/views/layouts/public.html.erb +++ b/decidim_app-design/app/views/layouts/public.html.erb @@ -2,7 +2,7 @@ <%= @title || "Decidim Design" %> - + <%= stylesheet_link_tag "public", media: "all", 'data-turbolinks-track': "reload" %> <%= javascript_include_tag "public", 'data-turbolinks-track': "reload" %> <%= favicon_link_tag "favicon.png" %> diff --git a/decidim_app-design/app/views/public/amendments/amendment-creation-wizard.html.erb b/decidim_app-design/app/views/public/amendments/amendment-creation-wizard.html.erb index c8730e2be005..52461f05dede 100644 --- a/decidim_app-design/app/views/public/amendments/amendment-creation-wizard.html.erb +++ b/decidim_app-design/app/views/public/amendments/amendment-creation-wizard.html.erb @@ -27,7 +27,7 @@
    diff --git a/decidim_app-design/app/views/public/amendments/proposal-view-with-amendment-rejected.html.erb b/decidim_app-design/app/views/public/amendments/proposal-view-with-amendment-rejected.html.erb index 7ad82d2ba3cf..deaa9fab1f6d 100644 --- a/decidim_app-design/app/views/public/amendments/proposal-view-with-amendment-rejected.html.erb +++ b/decidim_app-design/app/views/public/amendments/proposal-view-with-amendment-rejected.html.erb @@ -11,7 +11,7 @@
    -

    This amendment for the proposal Donec facilisis tortor ut augue was rejected on 11/10/2018.
    
You can publish this ammendment as an independent proposal.

    +

    This amendment for the proposal Donec facilisis tortor ut augue was rejected on 11/10/2018.
    
You can publish this ammendment as an independent proposal.

    diff --git a/decidim_app-design/app/views/public/assemblies/assemblies.html.erb b/decidim_app-design/app/views/public/assemblies/assemblies.html.erb index 1efca22c10e4..6a47e5184cfe 100644 --- a/decidim_app-design/app/views/public/assemblies/assemblies.html.erb +++ b/decidim_app-design/app/views/public/assemblies/assemblies.html.erb @@ -124,7 +124,7 @@

    Todas las asambleas

    <%= partial "inline_filters" %>
    -
    +
    <% 3.times do %> diff --git a/decidim_app-design/app/views/public/assemblies/assembly-view.html.erb b/decidim_app-design/app/views/public/assemblies/assembly-view.html.erb index 69534ec39183..f71a8be45280 100644 --- a/decidim_app-design/app/views/public/assemblies/assembly-view.html.erb +++ b/decidim_app-design/app/views/public/assemblies/assembly-view.html.erb @@ -26,12 +26,12 @@
  • - <%= Faker::Date.forward(365).strftime("%e %B %Y") %>
    + <%= Faker::Date.forward(365).strftime("%e %B %Y") %>
    <%= Faker::Time.forward(365, :evening).strftime("%R") %> - <%= Faker::Time.forward(365, :evening).strftime("%R") %>
    -
    +
    - <%= Faker::Address.community %>
    + <%= Faker::Address.community %>
    <%= Faker::Address.street_address %> <%= Faker::Address.zip %> <%= Faker::Address.city %>
    • diff --git a/decidim_app-design/app/views/public/cards/m/_assembly.html.erb b/decidim_app-design/app/views/public/cards/m/_assembly.html.erb index c98d7d090187..f61ccd074d08 100644 --- a/decidim_app-design/app/views/public/cards/m/_assembly.html.erb +++ b/decidim_app-design/app/views/public/cards/m/_assembly.html.erb @@ -62,7 +62,7 @@
    - 
    Asamblea con icono

    + 
    Asamblea con icono

    <%= icon "assemblies", class: "icon--big" %> Asamblea
    diff --git a/decidim_app-design/app/views/public/cards/m/_consultation.html.erb b/decidim_app-design/app/views/public/cards/m/_consultation.html.erb index 670331641b2c..4910788a6d1c 100644 --- a/decidim_app-design/app/views/public/cards/m/_consultation.html.erb +++ b/decidim_app-design/app/views/public/cards/m/_consultation.html.erb @@ -262,7 +262,7 @@
    - 
    Consulta con identificador

    + 
    Consulta con identificador

    <%= icon "consultation", class: "icon--big" %> consulta
    diff --git a/decidim_app-design/app/views/public/cards/m/_meeting.html.erb b/decidim_app-design/app/views/public/cards/m/_meeting.html.erb index f3fe602fc1a3..526bb2c6e8ce 100644 --- a/decidim_app-design/app/views/public/cards/m/_meeting.html.erb +++ b/decidim_app-design/app/views/public/cards/m/_meeting.html.erb @@ -37,7 +37,7 @@
    <%= Faker::Address.community %> -
    +
    <%= Faker::Address.street_address %> <%= Faker::Address.zip %> <%= Faker::Address.city %>
    Como llegar @@ -116,7 +116,7 @@
    <%= Faker::Address.community %> -
    +
    <%= Faker::Address.street_address %> <%= Faker::Address.zip %> <%= Faker::Address.city %>
    Como llegar @@ -197,7 +197,7 @@
    <%= Faker::Address.community %> -
    +
    <%= Faker::Address.street_address %> <%= Faker::Address.zip %> <%= Faker::Address.city %>
    @@ -339,7 +339,7 @@
    <%= Faker::Address.community %> -
    +
    <%= Faker::Address.street_address %> <%= Faker::Address.zip %> <%= Faker::Address.city %>
    Como llegar @@ -421,7 +421,7 @@
    <%= Faker::Address.community %> -
    +
    <%= Faker::Address.street_address %> <%= Faker::Address.zip %> <%= Faker::Address.city %>
    Como llegar diff --git a/decidim_app-design/app/views/public/cards/m/_process.html.erb b/decidim_app-design/app/views/public/cards/m/_process.html.erb index bb26aceea3b8..39d83613808e 100644 --- a/decidim_app-design/app/views/public/cards/m/_process.html.erb +++ b/decidim_app-design/app/views/public/cards/m/_process.html.erb @@ -203,7 +203,7 @@
    - 
    Proceso con icono

    + 
    Proceso con icono

    <%= icon "process", class: "icon--big" %> proceso
    @@ -272,7 +272,7 @@
    - 
    Proceso con icono e imagen

    + 
    Proceso con icono e imagen

    <%= icon "process", class: "icon--big" %> proceso
    diff --git a/decidim_app-design/app/views/public/cards/m/_search-results.html.erb b/decidim_app-design/app/views/public/cards/m/_search-results.html.erb index 745103bbf59d..b6075f753e58 100644 --- a/decidim_app-design/app/views/public/cards/m/_search-results.html.erb +++ b/decidim_app-design/app/views/public/cards/m/_search-results.html.erb @@ -1,6 +1,6 @@
    - 
    Vista común de una búsqueda

    + 
    Vista común de una búsqueda

    identificador
    diff --git a/decidim_app-design/app/views/public/cards/m/_survey.html.erb b/decidim_app-design/app/views/public/cards/m/_survey.html.erb index ec801297c109..f186f8659084 100644 --- a/decidim_app-design/app/views/public/cards/m/_survey.html.erb +++ b/decidim_app-design/app/views/public/cards/m/_survey.html.erb @@ -48,7 +48,7 @@
    - 
    Encuesta con identificador

    + 
    Encuesta con identificador

    <%= icon "task", class: "icon--big" %> encuesta
    diff --git a/decidim_app-design/app/views/public/conferences/conference-view-diploma.html.erb b/decidim_app-design/app/views/public/conferences/conference-view-diploma.html.erb index 7f8c02eb6a84..c406bacd47ed 100644 --- a/decidim_app-design/app/views/public/conferences/conference-view-diploma.html.erb +++ b/decidim_app-design/app/views/public/conferences/conference-view-diploma.html.erb @@ -12,7 +12,7 @@

    Certificate of Attendance

    This is to certify that <%= Faker::Name.name %> has attended and taken part in the <%= conference %> held at the <%= Faker::Address.community %> on <%= date %>

    -
    +
    Attendance verified by
    diff --git a/decidim_app-design/app/views/public/conferences/conference-view-media.html.erb b/decidim_app-design/app/views/public/conferences/conference-view-media.html.erb index 93287a75e06f..0552a2b8cdfd 100644 --- a/decidim_app-design/app/views/public/conferences/conference-view-media.html.erb +++ b/decidim_app-design/app/views/public/conferences/conference-view-media.html.erb @@ -14,7 +14,7 @@

    Media and links

    Links about this conference

    -
    +
      <% @titles = [ @@ -34,7 +34,7 @@ <% end %>
    -
    +
    <% @photos = [ diff --git a/decidim_app-design/app/views/public/conferences/conference-view-speakers.html.erb b/decidim_app-design/app/views/public/conferences/conference-view-speakers.html.erb index 12f3e8913c4c..7fb6c9649a2b 100644 --- a/decidim_app-design/app/views/public/conferences/conference-view-speakers.html.erb +++ b/decidim_app-design/app/views/public/conferences/conference-view-speakers.html.erb @@ -50,7 +50,7 @@

    I also life embodied and embedded in hacktivism, technopolitics and reproduction of commons and free knowledge.

    -
    +
    Speaking at
    diff --git a/decidim_app-design/app/views/public/conferences/conference-view.html.erb b/decidim_app-design/app/views/public/conferences/conference-view.html.erb index e60964940d81..c5c471f1d287 100644 --- a/decidim_app-design/app/views/public/conferences/conference-view.html.erb +++ b/decidim_app-design/app/views/public/conferences/conference-view.html.erb @@ -20,7 +20,7 @@

  • deliberar sobre els usos i possibilitats futures

    • -
    +

    Detalls

    Les I Jornades/Hackató de desenvolupament participatiu de la plataforma decidim.barcelona han de servir per a que la ciutadania s’apropi del desenvolupament, supervisió i millora del decidim.barcelona. Les I Jornades/Hackató de desenvolupament participatiu de la plataforma decidim.barcelona han de servir per a que la ciutadania s’apropi del desenvolupament, supervisió i millora del decidim.barcelona.

    @@ -45,7 +45,7 @@
    -
    +

    Grupo motor

    @@ -57,7 +57,7 @@ <% end %>
    -
    +

    Colaboradores

    @@ -68,7 +68,7 @@ <% end %>
    -
    +

    Ubicaciones

    @@ -85,7 +85,7 @@
    -
    +

    Registro-1

    @@ -103,7 +103,7 @@
    -
    +

    Registro-2

    diff --git a/decidim_app-design/app/views/public/consultations-entities-view.html.erb b/decidim_app-design/app/views/public/consultations-entities-view.html.erb index 9e5ab066f2b3..b10a985bb89a 100644 --- a/decidim_app-design/app/views/public/consultations-entities-view.html.erb +++ b/decidim_app-design/app/views/public/consultations-entities-view.html.erb @@ -17,7 +17,7 @@
    - + Societat Amics del Aigua diff --git a/decidim_app-design/app/views/public/consultations-entities.html.erb b/decidim_app-design/app/views/public/consultations-entities.html.erb index 6430d0e113b6..4ce4825405f9 100644 --- a/decidim_app-design/app/views/public/consultations-entities.html.erb +++ b/decidim_app-design/app/views/public/consultations-entities.html.erb @@ -43,7 +43,7 @@
    - + Societat Amics del Aigua @@ -83,7 +83,7 @@
    - + Asociación por el Libre Mercado @@ -123,7 +123,7 @@
    - + Refraneros de Barcelona @@ -163,7 +163,7 @@
    - + Societat Amics del Aigua @@ -203,7 +203,7 @@
    - + Asociación por el Libre Mercado @@ -243,7 +243,7 @@
    - + Refraneros de Barcelona diff --git a/decidim_app-design/app/views/public/consultations-meetings.html.erb b/decidim_app-design/app/views/public/consultations-meetings.html.erb index 241e5e1c57cd..7012d4994cb8 100644 --- a/decidim_app-design/app/views/public/consultations-meetings.html.erb +++ b/decidim_app-design/app/views/public/consultations-meetings.html.erb @@ -43,8 +43,8 @@ <%= icon "meetings", removeIconClass: true, width: 40, height: 70 %>
    - Seu del Districte Sants-Montjuïc
    - Carrer de la Creu Coberta, 104
    + Seu del Districte Sants-Montjuïc
    + Carrer de la Creu Coberta, 104
    Barcelona
    @@ -84,8 +84,8 @@ <%= icon "meetings", removeIconClass: true, width: 40, height: 70 %>
    - Seu del Districte Sants-Montjuïc
    - Carrer de la Creu Coberta, 104
    + Seu del Districte Sants-Montjuïc
    + Carrer de la Creu Coberta, 104
    Barcelona
    @@ -122,8 +122,8 @@ <%= icon "meetings", removeIconClass: true, width: 40, height: 70 %>
    - Seu del Districte Sants-Montjuïc
    - Carrer de la Creu Coberta, 104
    + Seu del Districte Sants-Montjuïc
    + Carrer de la Creu Coberta, 104
    Barcelona
    diff --git a/decidim_app-design/app/views/public/consultations-voting-places.html.erb b/decidim_app-design/app/views/public/consultations-voting-places.html.erb index 3f7649e1b798..76ce1969d7cf 100644 --- a/decidim_app-design/app/views/public/consultations-voting-places.html.erb +++ b/decidim_app-design/app/views/public/consultations-voting-places.html.erb @@ -14,7 +14,7 @@

    - El proceso multiconsulta estará abierto desde el 5 hasta el 12 de mayo de 2018.
    + El proceso multiconsulta estará abierto desde el 5 hasta el 12 de mayo de 2018.
    Las votaciones se pueden realizar online a través de esta página web, o presencialmente en los puntos de la ciudad de Barcelona señalados a continuación.

    @@ -31,8 +31,8 @@ Las votaciones se pueden realizar online a través de esta página web, o pres <%= icon "meetings", removeIconClass: true, width: 40, height: 70 %>
    - Seu del Districte Sants-Montjuïc
    - Carrer de la Creu Coberta, 104
    + Seu del Districte Sants-Montjuïc
    + Carrer de la Creu Coberta, 104
    Barcelona
    @@ -47,8 +47,8 @@ Las votaciones se pueden realizar online a través de esta página web, o pres <%= icon "meetings", removeIconClass: true, width: 40, height: 70 %>
    - Seu del Districte Sants-Montjuïc
    - Carrer de la Creu Coberta, 104
    + Seu del Districte Sants-Montjuïc
    + Carrer de la Creu Coberta, 104
    Barcelona
    @@ -63,8 +63,8 @@ Las votaciones se pueden realizar online a través de esta página web, o pres <%= icon "meetings", removeIconClass: true, width: 40, height: 70 %>
    - Seu del Districte Sants-Montjuïc, Lorem ipsum
    - Carrer de la Creu Coberta, 104
    + Seu del Districte Sants-Montjuïc, Lorem ipsum
    + Carrer de la Creu Coberta, 104
    Barcelona
    diff --git a/decidim_app-design/app/views/public/email-inline.html.erb b/decidim_app-design/app/views/public/email-inline.html.erb index 94bb628fcc85..66cf1f8b6b25 100644 --- a/decidim_app-design/app/views/public/email-inline.html.erb +++ b/decidim_app-design/app/views/public/email-inline.html.erb @@ -2,8 +2,8 @@ - - + + Title @@ -369,7 +369,7 @@
    diff --git a/decidim_app-design/app/views/public/form-datepicker.html.erb b/decidim_app-design/app/views/public/form-datepicker.html.erb index 1bb3629cf985..68c2e86892b3 100644 --- a/decidim_app-design/app/views/public/form-datepicker.html.erb +++ b/decidim_app-design/app/views/public/form-datepicker.html.erb @@ -29,7 +29,7 @@

    diff --git a/decidim_app-design/app/views/public/form-validation.html.erb b/decidim_app-design/app/views/public/form-validation.html.erb index 755e16383255..a1f6784d71f1 100644 --- a/decidim_app-design/app/views/public/form-validation.html.erb +++ b/decidim_app-design/app/views/public/form-validation.html.erb @@ -41,7 +41,7 @@
    Falta el número de documento. @@ -94,7 +94,7 @@
    Por favor, introduce un código postal. @@ -107,7 +107,7 @@
    diff --git a/decidim_app-design/app/views/public/home-single-process.html.erb b/decidim_app-design/app/views/public/home-single-process.html.erb index 0bee523c9e8f..db70adc2536c 100644 --- a/decidim_app-design/app/views/public/home-single-process.html.erb +++ b/decidim_app-design/app/views/public/home-single-process.html.erb @@ -9,7 +9,7 @@

    - Construïm entre tots
    la Barcelona que volem + Construïm entre tots
    la Barcelona que volem

    @@ -28,7 +28,7 @@

    Lorem ipsum dolor sit amet, consectetur adipisicing elit. Suscipit, dicta repudiandae

    <%= icon "magnifying-glass", aria_label: "Buscar", role: "img" %> - +
    diff --git a/decidim_app-design/app/views/public/home-with-consultation-banners.html.erb b/decidim_app-design/app/views/public/home-with-consultation-banners.html.erb index 8ece03e5b4b1..bea5dd0235a4 100644 --- a/decidim_app-design/app/views/public/home-with-consultation-banners.html.erb +++ b/decidim_app-design/app/views/public/home-with-consultation-banners.html.erb @@ -11,7 +11,7 @@

    - Construïm entre tots
    la Barcelona que volem + Construïm entre tots
    la Barcelona que volem

    diff --git a/decidim_app-design/app/views/public/home-with-helpers.html.erb b/decidim_app-design/app/views/public/home-with-helpers.html.erb index 430450ec24f0..3229aa5c2d51 100644 --- a/decidim_app-design/app/views/public/home-with-helpers.html.erb +++ b/decidim_app-design/app/views/public/home-with-helpers.html.erb @@ -9,7 +9,7 @@

    - Construïm entre tots
    la Barcelona que volem + Construïm entre tots
    la Barcelona que volem

    @@ -28,7 +28,7 @@

    Lorem ipsum dolor sit amet, consectetur adipisicing elit. Suscipit, dicta repudiandae

    <%= icon "magnifying-glass", aria_label: "Buscar", role: "img" %> - +
    diff --git a/decidim_app-design/app/views/public/home.html.erb b/decidim_app-design/app/views/public/home.html.erb index 9cebfe8b440c..c96995599a25 100644 --- a/decidim_app-design/app/views/public/home.html.erb +++ b/decidim_app-design/app/views/public/home.html.erb @@ -9,7 +9,7 @@

    - Construïm entre tots
    la Barcelona que volem + Construïm entre tots
    la Barcelona que volem

    @@ -28,7 +28,7 @@

    Lorem ipsum dolor sit amet, consectetur adipisicing elit. Suscipit, dicta repudiandae

    <%= icon "magnifying-glass", aria_label: "Buscar", role: "img" %> - +
    diff --git a/decidim_app-design/app/views/public/index.html.erb b/decidim_app-design/app/views/public/index.html.erb index 62f9e049ffa0..654aab8c214b 100644 --- a/decidim_app-design/app/views/public/index.html.erb +++ b/decidim_app-design/app/views/public/index.html.erb @@ -196,7 +196,7 @@
  • <%= link_to "OAuth: Autorización", page_path("oauth") %>
    • -
    +

    Technical

    Librería de patrones

    @@ -223,7 +223,7 @@
  • <%= link_to "Ejemplo de email con estilos inline", page_path("email-inline") %>
    • -
    +

    Legacy views

    Vistas principales

    diff --git a/decidim_app-design/app/views/public/initiatives/initiatives-support-step-1.html.erb b/decidim_app-design/app/views/public/initiatives/initiatives-support-step-1.html.erb index ea589a3ca78c..f0a4a3d31c3b 100644 --- a/decidim_app-design/app/views/public/initiatives/initiatives-support-step-1.html.erb +++ b/decidim_app-design/app/views/public/initiatives/initiatives-support-step-1.html.erb @@ -62,7 +62,7 @@
  • Estos órganos están formados por entidades, expertos y ciudadanía en general con la voluntad de conocer y mejorar las políticas municipales de un ámbito determinado.
  • A través de la iniciativa ciudadana, recogiendo 9000 firmas, se puede proponer la creación de un nuevo órgano de ámbito de ciudad, que se constituirá siempre que haya un dictamen favorable del Consejo de Ciudad.
    • -
    +
    <%= link_to page_path("initiatives/initiatives-support-step-2") do %> <% end %> @@ -76,7 +76,7 @@
  • A través de la iniciativa ciudadana, recogiendo 9000 firmas, se puede proponer la creación de un nuevo órgano de ámbito de ciudad, que se constituirá siempre que haya un dictamen favorable del Consejo de Ciudad.
  • Estos órganos están formados por entidades, expertos y ciudadanía en general con la voluntad de conocer y mejorar las políticas municipales de un ámbito determinado.
    • -
    +
    <%= link_to page_path("initiatives/initiatives-support-step-2") do %> <% end %> @@ -90,7 +90,7 @@
  • Pueden ser sectoriales (temáticos) como por ejemplo el Consejo de Mujeres, del Acuerdo por una Barcelona Inclusiva o el Consejo de Turismo, o bien de ámbito territorial, como los Consejos de Barrio, los Consejos Ciudadanos de Distrito o el Consejo de Ciudad, que es el máximo órgano de participación de Barcelona.
  • A través de la iniciativa ciudadana, recogiendo 9000 firmas, se puede proponer la creación de un nuevo órgano de ámbito de ciudad, que se constituirá siempre que haya un dictamen favorable del Consejo de Ciudad.
    • -
    +
    <%= link_to page_path("initiatives/initiatives-support-step-2") do %> <% end %> diff --git a/decidim_app-design/app/views/public/initiatives/initiatives-support-step-2.html.erb b/decidim_app-design/app/views/public/initiatives/initiatives-support-step-2.html.erb index 2a219fa04032..357c03cc0d9f 100644 --- a/decidim_app-design/app/views/public/initiatives/initiatives-support-step-2.html.erb +++ b/decidim_app-design/app/views/public/initiatives/initiatives-support-step-2.html.erb @@ -52,7 +52,7 @@
    diff --git a/decidim_app-design/app/views/public/initiatives/initiatives-support-step-3.html.erb b/decidim_app-design/app/views/public/initiatives/initiatives-support-step-3.html.erb index 3b60649e65a4..4251bc95e7dd 100644 --- a/decidim_app-design/app/views/public/initiatives/initiatives-support-step-3.html.erb +++ b/decidim_app-design/app/views/public/initiatives/initiatives-support-step-3.html.erb @@ -52,37 +52,37 @@
    diff --git a/decidim_app-design/app/views/public/library/_library-buttons.html.erb b/decidim_app-design/app/views/public/library/_library-buttons.html.erb index 3cadc07f1f78..a8684b42501d 100644 --- a/decidim_app-design/app/views/public/library/_library-buttons.html.erb +++ b/decidim_app-design/app/views/public/library/_library-buttons.html.erb @@ -10,11 +10,11 @@ -
    +
    -
    +
    diff --git a/decidim_app-design/app/views/public/partials/_flag.html.erb b/decidim_app-design/app/views/public/partials/_flag.html.erb index 5d329c27c7c3..cd7bc681e21b 100644 --- a/decidim_app-design/app/views/public/partials/_flag.html.erb +++ b/decidim_app-design/app/views/public/partials/_flag.html.erb @@ -13,13 +13,13 @@

    diff --git a/decidim_app-design/app/views/public/partials/_meetings_highlights.html.erb b/decidim_app-design/app/views/public/partials/_meetings_highlights.html.erb index ce7f27cefbeb..d49ea8b0d03d 100644 --- a/decidim_app-design/app/views/public/partials/_meetings_highlights.html.erb +++ b/decidim_app-design/app/views/public/partials/_meetings_highlights.html.erb @@ -25,8 +25,8 @@ <%= icon "meetings", removeIconClass: true, width: 40, height: 70 %>
    - Seu del Districte Sants-Montjuïc
    - Carrer de la Creu Coberta, 104
    + Seu del Districte Sants-Montjuïc
    + Carrer de la Creu Coberta, 104
    Barcelona
    @@ -57,8 +57,8 @@ <%= icon "meetings", removeIconClass: true, width: 40, height: 70 %>
    - Seu del Districte Sants-Montjuïc
    - Carrer de la Creu Coberta, 104
    + Seu del Districte Sants-Montjuïc
    + Carrer de la Creu Coberta, 104
    Barcelona
    diff --git a/decidim_app-design/app/views/public/partials/_related_meetings.html.erb b/decidim_app-design/app/views/public/partials/_related_meetings.html.erb index 2449126ffdd9..ae6596e7e796 100644 --- a/decidim_app-design/app/views/public/partials/_related_meetings.html.erb +++ b/decidim_app-design/app/views/public/partials/_related_meetings.html.erb @@ -28,8 +28,8 @@
    - Seu del Districte Sants-Montjuïc
    - Carrer de la Creu Coberta, 104
    + Seu del Districte Sants-Montjuïc
    + Carrer de la Creu Coberta, 104
    Barcelona
    diff --git a/decidim_app-design/app/views/public/partials/_search_input.html.erb b/decidim_app-design/app/views/public/partials/_search_input.html.erb index 9908715a50a2..11dadf96989b 100644 --- a/decidim_app-design/app/views/public/partials/_search_input.html.erb +++ b/decidim_app-design/app/views/public/partials/_search_input.html.erb @@ -1,5 +1,5 @@
    - +
    diff --git a/decidim_app-design/app/views/public/participatory/_index.html.erb b/decidim_app-design/app/views/public/participatory/_index.html.erb index 319d0afae540..bb0b73bfdbec 100644 --- a/decidim_app-design/app/views/public/participatory/_index.html.erb +++ b/decidim_app-design/app/views/public/participatory/_index.html.erb @@ -9,13 +9,13 @@ <%= "Capitol " + (i + 1).to_s + ". " + Faker::Lorem.sentence %> <% end %> -
    +
    <% Faker::Number.between(5, 10).times do |j| %> <%= link_to page_path("participatory/participatory-texts-view") do %> <%= "Article " + (j + 1).to_s + ". " + Faker::Lorem.sentence %> -
    +
    <% end %> <% end %>

    diff --git a/decidim_app-design/app/views/public/profile/_conversation.html.erb b/decidim_app-design/app/views/public/profile/_conversation.html.erb index c296b500b4c9..f9cbb475083e 100644 --- a/decidim_app-design/app/views/public/profile/_conversation.html.erb +++ b/decidim_app-design/app/views/public/profile/_conversation.html.erb @@ -10,7 +10,7 @@ <% end %>
    Conversación con <%= Faker::Name.name %> -
    +
    @<%= Faker::Twitter.screen_name %>
    diff --git a/decidim_app-design/app/views/public/profile/_conversations.html.erb b/decidim_app-design/app/views/public/profile/_conversations.html.erb index e151c0de1261..f1bbb089ceea 100644 --- a/decidim_app-design/app/views/public/profile/_conversations.html.erb +++ b/decidim_app-design/app/views/public/profile/_conversations.html.erb @@ -12,9 +12,9 @@
  • De: <%= Faker::Name.name %> @<%= Faker::Twitter.screen_name %> -
    +
    <%= Faker::FamilyGuy.quote %> -
    +
    Último mensaje: hace <%= Faker::Number.between(1, 59) %> minutos
    diff --git a/decidim_app-design/app/views/public/profile/_notifications.html.erb b/decidim_app-design/app/views/public/profile/_notifications.html.erb index 7407a42c9baf..eae72c86b65e 100644 --- a/decidim_app-design/app/views/public/profile/_notifications.html.erb +++ b/decidim_app-design/app/views/public/profile/_notifications.html.erb @@ -13,7 +13,7 @@
  • Comment -
    +
    <%= Faker::Number.digit %> nous comentaris a <%= Faker::ChuckNorris.fact %>
    <%= icon "circle-x", class: "card__link" %>
    diff --git a/decidim_app-design/app/views/public/profile/_user-card.html.erb b/decidim_app-design/app/views/public/profile/_user-card.html.erb index b6540604068b..5d6ea9c8703d 100644 --- a/decidim_app-design/app/views/public/profile/_user-card.html.erb +++ b/decidim_app-design/app/views/public/profile/_user-card.html.erb @@ -1,5 +1,5 @@
    - +
    <%= Faker::Name.name %>
    diff --git a/decidim_app-design/app/views/public/proposals/new-proposal.html.erb b/decidim_app-design/app/views/public/proposals/new-proposal.html.erb index 2cfca2d9f7b4..522772a33c31 100644 --- a/decidim_app-design/app/views/public/proposals/new-proposal.html.erb +++ b/decidim_app-design/app/views/public/proposals/new-proposal.html.erb @@ -24,7 +24,7 @@
    diff --git a/decidim_app-design/app/views/public/proposals/proposals-wizard-step-1.html.erb b/decidim_app-design/app/views/public/proposals/proposals-wizard-step-1.html.erb index c2aaa2e8c783..37fb87ca0f7e 100644 --- a/decidim_app-design/app/views/public/proposals/proposals-wizard-step-1.html.erb +++ b/decidim_app-design/app/views/public/proposals/proposals-wizard-step-1.html.erb @@ -49,7 +49,7 @@
    diff --git a/decidim_app-design/app/views/public/proposals/proposals-wizard-step-3.html.erb b/decidim_app-design/app/views/public/proposals/proposals-wizard-step-3.html.erb index ea7c75ba6bd1..b45fa1bcb7db 100644 --- a/decidim_app-design/app/views/public/proposals/proposals-wizard-step-3.html.erb +++ b/decidim_app-design/app/views/public/proposals/proposals-wizard-step-3.html.erb @@ -106,7 +106,7 @@ Modifica la propuesta
    - +
    diff --git a/decidim_app-design/app/views/public/search.html.erb b/decidim_app-design/app/views/public/search.html.erb index 5af8eeb5e540..d6319ece9919 100644 --- a/decidim_app-design/app/views/public/search.html.erb +++ b/decidim_app-design/app/views/public/search.html.erb @@ -83,7 +83,7 @@ <%= link_to "View all initiatives (" + Faker::Number.between(0, 100).to_s + ")", page_path("initiatives/initiatives"), class: "button secondary light pull-right" %>
    -
    +

    Proposals <%= Faker::Number.between(0, 100) %> results

    <% 2.times do %> @@ -150,7 +150,7 @@ <% end %>
    -
    +

    Users <%= Faker::Number.between(0, 100) %> results

    <% 2.times do %> diff --git a/decidim_app-design/app/views/public/user/_modal-question-user-existent.html.erb b/decidim_app-design/app/views/public/user/_modal-question-user-existent.html.erb index f03feaef77f8..7690cdeffe4f 100644 --- a/decidim_app-design/app/views/public/user/_modal-question-user-existent.html.erb +++ b/decidim_app-design/app/views/public/user/_modal-question-user-existent.html.erb @@ -9,10 +9,10 @@
    diff --git a/decidim_app-design/app/views/public/user/_modal-question-user-new.html.erb b/decidim_app-design/app/views/public/user/_modal-question-user-new.html.erb index dbd36ecf2fdd..06f48ca6c3a1 100644 --- a/decidim_app-design/app/views/public/user/_modal-question-user-new.html.erb +++ b/decidim_app-design/app/views/public/user/_modal-question-user-new.html.erb @@ -9,14 +9,14 @@

    Vemos que eres un nuevo usuario, puedes hacer el registro completo o continuar con el registro rápido:

    diff --git a/decidim_app-design/app/views/public/user/_modal-question.html.erb b/decidim_app-design/app/views/public/user/_modal-question.html.erb index 785aa7121346..b4d56e44054c 100644 --- a/decidim_app-design/app/views/public/user/_modal-question.html.erb +++ b/decidim_app-design/app/views/public/user/_modal-question.html.erb @@ -9,7 +9,7 @@
    diff --git a/decidim_app-design/app/views/public/user/user-confirm.html.erb b/decidim_app-design/app/views/public/user/user-confirm.html.erb index 2a4680a7aac0..1504e5518666 100644 --- a/decidim_app-design/app/views/public/user/user-confirm.html.erb +++ b/decidim_app-design/app/views/public/user/user-confirm.html.erb @@ -15,7 +15,7 @@
    diff --git a/decidim_app-design/app/views/public/user/user-login.html.erb b/decidim_app-design/app/views/public/user/user-login.html.erb index 1fbecafd9ca0..3b42bdd7fe3b 100644 --- a/decidim_app-design/app/views/public/user/user-login.html.erb +++ b/decidim_app-design/app/views/public/user/user-login.html.erb @@ -19,18 +19,18 @@
    diff --git a/decidim_app-design/app/views/public/user/user-new-password.html.erb b/decidim_app-design/app/views/public/user/user-new-password.html.erb index 6785113b4fdf..e8816016915d 100644 --- a/decidim_app-design/app/views/public/user/user-new-password.html.erb +++ b/decidim_app-design/app/views/public/user/user-new-password.html.erb @@ -15,7 +15,7 @@

    Selecciona una imagen de perfil

    - +
    @@ -57,14 +57,14 @@

    @@ -74,11 +74,11 @@ data-toggler=".is-expanded">

    -
    +

    Versión simple con título dentro

    partial "areachart", title: "Lorem ipsum" @@ -34,7 +34,7 @@ <%= partial "areachart", title: "Lorem ipsum dolor sit amet, consectetur adipisicing elit. Libero harum natus ipsa, eum sunt fuga repudiandae necessitatibus deleniti enim atque" %>
    -
    +

    Versión simple con letra pequeña (poco espacio)

    partial "areachart", classes: "small" @@ -46,7 +46,7 @@
    <% end %>
    -
    +

    Versión con ejes

    partial "areachart", axis: true @@ -58,7 +58,7 @@
    <% end %>
    -
    +

    Versión con ejes y letra pequeña (axis: true activa la letra pequeña)

    partial "areachart", axis: true @@ -70,7 +70,7 @@
    <% end %>
    • -
    +

    Versión sin tooltip (por defecto tip: true)

    partial "areachart", tip: false @@ -83,7 +83,7 @@ <%= partial "areachart", title: Faker::Commerce.department(1), axis: true, tip: false %>
    -
    +

    Versión con diferentes ratios

    @@ -99,7 +99,7 @@
    <% end %>
    -
    +

    11:4

    partial "areachart", ratio: "11:4" @@ -109,7 +109,7 @@ <%= partial "areachart", ratio: "11:4", title: Faker::Commerce.department(1) %>
    -
    +

    Adaptables al contenedor

    Dos columnas
    @@ -131,7 +131,7 @@
    <% end %> -
    +

    Diferentes colores según su status

    partial "areachart", classes: "secondary|warning|success|alert", url: "..." @@ -147,7 +147,7 @@ <%= partial "areachart", classes: "success", title: Faker::Commerce.department(1) %>
    -
    +

    Datos sin agregar (por defecto agg: true)

    partial "areachart", agg: false, url: "..." diff --git a/decidim_app-design/app/views/public/vizzs/_linecharts.html.erb b/decidim_app-design/app/views/public/vizzs/_linecharts.html.erb index 2446914025b0..26b9abdddf95 100644 --- a/decidim_app-design/app/views/public/vizzs/_linecharts.html.erb +++ b/decidim_app-design/app/views/public/vizzs/_linecharts.html.erb @@ -17,7 +17,7 @@ key, en el array anidado, ha de ser una fecha en formato ISO
    -
    +

    Versión simple

    partial "linechart", metric: "metrica", title: "Lorem", subtitle: "Ipsum" @@ -25,7 +25,7 @@
    <%= partial "linechart", metric: "linechart-" + SecureRandom.random_number(2).to_s, title: Faker::GameOfThrones.character, subtitle: Faker::Lorem.sentence %>
    -
    +

    Versión con diferentes ratios

    @@ -44,7 +44,7 @@
    <%= partial "linechart", ratio: "5:4", metric: "linechart-" + SecureRandom.random_number(2).to_s, title: Faker::Commerce.department(1), subtitle: Faker::Lorem.sentence %>
    -
    +

    Versión sin título ni subtítulo

    partial "linechart", metric: "metrica" @@ -52,7 +52,7 @@
    <%= partial "linechart", metric: "linechart-" + SecureRandom.random_number(2).to_s %>
    -
    +

    Diferentes colores según su status

    @@ -74,7 +74,7 @@ <%= partial "linechart", classes: "alert", metric: "linechart-" + SecureRandom.random_number(2).to_s, title: Faker::Commerce.department(1), subtitle: Faker::Lorem.sentence %>
    -
    +

    Versión sin tooltip (por defecto tip: true)

    partial "linechart", metric: "metrica", tip: false @@ -87,7 +87,7 @@ <%= partial "linechart", metric: "linechart-" + SecureRandom.random_number(2).to_s, title: Faker::Commerce.department(1), subtitle: Faker::Lorem.sentence, tip: false %>
    -
    +

    Adaptables al contenedor

    diff --git a/decidim_app-design/app/views/public/vizzs/_rowcharts.html.erb b/decidim_app-design/app/views/public/vizzs/_rowcharts.html.erb index 468a714451b3..6b6a7e7a969b 100644 --- a/decidim_app-design/app/views/public/vizzs/_rowcharts.html.erb +++ b/decidim_app-design/app/views/public/vizzs/_rowcharts.html.erb @@ -16,7 +16,7 @@ ]
    -
    +

    Versión simple

    partial "rowchart", metric: "metrica", title: "Lorem", subtitle: "Ipsum" @@ -24,7 +24,7 @@
    <%= partial "rowchart", metric: "rowchart-" + SecureRandom.random_number(2).to_s, title: Faker::GameOfThrones.character, subtitle: Faker::Lorem.sentence %>
    -
    +

    Versión con diferentes ratios

    @@ -43,7 +43,7 @@
    <%= partial "rowchart", ratio: "5:4", metric: "rowchart-" + SecureRandom.random_number(2).to_s, title: Faker::Commerce.department(1), subtitle: Faker::Lorem.sentence %>
    -
    +

    Versión sin título ni subtítulo

    partial "rowchart", metric: "metrica" @@ -51,7 +51,7 @@
    <%= partial "rowchart", metric: "rowchart-" + SecureRandom.random_number(2).to_s %>
    -
    +

    Versión con muchas categorías (máximo 12)

    @@ -62,7 +62,7 @@
    <%= partial "rowchart", metric: "rowchart-3", ratio: "1:2", title: Faker::Commerce.department(1), subtitle: Faker::Lorem.sentence %>
    -
    +

    Versión con etiquetas muy largas

    partial "rowchart", metric: "metrica" @@ -70,7 +70,7 @@
    <%= partial "rowchart", metric: "rowchart-2", title: Faker::Commerce.department(1), subtitle: Faker::Lorem.sentence %>
    -
    +

    Datos en porcentaje1 (por defecto percent: false)

    partial "rowchart", percent: true, metric: "metrica" @@ -86,7 +86,7 @@
    1 Ambos gráficos están usando el mismo dataset rowchart-0
    -
    +

    Diferentes colores según su status

    @@ -108,7 +108,7 @@ <%= partial "rowchart", classes: "alert", metric: "rowchart-" + SecureRandom.random_number(2).to_s, title: Faker::Commerce.department(1), subtitle: Faker::Lorem.sentence %>
    -
    +

    Versión sin tooltip (por defecto tip: true)

    partial "rowchart", metric: "metrica", tip: false @@ -121,7 +121,7 @@ <%= partial "rowchart", metric: "rowchart-" + SecureRandom.random_number(3).to_s, title: Faker::Commerce.department(1), subtitle: Faker::Lorem.sentence, tip: false %>
    -
    +

    Adaptables al contenedor

    id title categoría
    <%= Faker::Number.digit %> <%= Faker::FamilyGuy.quote %> <%= Faker::Food.dish %>
    <%= Faker::Number.digit %> <%= Faker::FamilyGuy.quote %> <%= Faker::Food.dish %>
    <%= Faker::Number.digit %> <%= Faker::FamilyGuy.quote %> <%= Faker::Food.dish %>
    - +