diff --git a/app/helpers/application_helper.rb b/app/helpers/application_helper.rb index 486759e03..95a77b2d9 100644 --- a/app/helpers/application_helper.rb +++ b/app/helpers/application_helper.rb @@ -7,10 +7,6 @@ module ApplicationHelper request.path == '/' end - def opendata_page? - request.path == '/opendata' - end - # if current path is /debates current_path_with_query_params(foo: 'bar') returns /debates?foo=bar # notice: if query_params have a param which also exist in current path, it "overrides" (query_params is merged last) def current_path_with_query_params(query_parameters) diff --git a/app/views/layouts/_footer.html.erb b/app/views/layouts/_footer.html.erb index 5a0a02f5f..adf78d066 100644 --- a/app/views/layouts/_footer.html.erb +++ b/app/views/layouts/_footer.html.erb @@ -53,15 +53,6 @@ <% end %> <% end %> - <% if setting['blog_url'] %> -
  • - <%= link_to setting['blog_url'], target: "_blank", - title: t("shared.go_to_page") + t("social.blog", org: setting['org_name']) + t('shared.target_blank_html') do %> - <%= t("social.blog", org: setting['org_name']) %> - - <% end %> -
  • - <% end %> <% if setting['youtube_handle'] %>
  • <%= link_to "https://www.youtube.com/#{setting['youtube_handle']}", target: "_blank", diff --git a/app/views/shared/_top_links.html.erb b/app/views/shared/_top_links.html.erb index 5db6edab5..7a5445ffc 100644 --- a/app/views/shared/_top_links.html.erb +++ b/app/views/shared/_top_links.html.erb @@ -1,13 +1,3 @@ diff --git a/config/locales/en/general.yml b/config/locales/en/general.yml index c058527bf..fd7260078 100644 --- a/config/locales/en/general.yml +++ b/config/locales/en/general.yml @@ -219,7 +219,6 @@ en: available_locales: Available languages collaborative_legislation: Legislation processes debates: Debates - external_link_blog: Blog locale: 'Language:' logo: CONSUL logo management: Management @@ -624,7 +623,6 @@ en: see_more: See more recommendations hide: Hide recommendations social: - blog: "%{org} Blog" facebook: "%{org} Facebook" twitter: "%{org} Twitter" youtube: "%{org} YouTube" diff --git a/config/locales/en/settings.yml b/config/locales/en/settings.yml index dcf570613..cadc825e3 100644 --- a/config/locales/en/settings.yml +++ b/config/locales/en/settings.yml @@ -73,9 +73,6 @@ en: min_age_to_participate: Minimum age needed to participate min_age_to_participate_description: "Users over this age can participate in all processes" analytics_url: "Analytics URL" - blog_url: "Blog URL" - transparency_url: "Transparency URL" - opendata_url: "Open Data URL" verification_offices_url: Verification offices URL proposal_improvement_path: Proposal improvement info internal link feature: diff --git a/config/locales/es/general.yml b/config/locales/es/general.yml index 6e6ac250f..3e8711e00 100644 --- a/config/locales/es/general.yml +++ b/config/locales/es/general.yml @@ -219,7 +219,6 @@ es: available_locales: Idiomas disponibles collaborative_legislation: Procesos legislativos debates: Debates - external_link_blog: Blog locale: 'Idioma:' logo: Logo de CONSUL management: Gestión @@ -623,7 +622,6 @@ es: see_more: Ver más recomendaciones hide: Ocultar recomendaciones social: - blog: "Blog de %{org}" facebook: "Facebook de %{org}" twitter: "Twitter de %{org}" youtube: "YouTube de %{org}" diff --git a/config/locales/es/settings.yml b/config/locales/es/settings.yml index 827947864..cda0e2b4a 100644 --- a/config/locales/es/settings.yml +++ b/config/locales/es/settings.yml @@ -73,9 +73,6 @@ es: min_age_to_participate: Edad mínima para participar min_age_to_participate_description: "Los usuarios mayores de esta edad podrán participar en todos los procesos" analytics_url: "URL de estadísticas externas" - blog_url: "URL del blog" - transparency_url: "URL de transparencia" - opendata_url: "URL de open data" verification_offices_url: URL oficinas verificación proposal_improvement_path: Link a información para mejorar propuestas feature: diff --git a/config/routes.rb b/config/routes.rb index 2785a3d66..9d9a345dc 100644 --- a/config/routes.rb +++ b/config/routes.rb @@ -48,6 +48,5 @@ Rails.application.routes.draw do get 'help/faq', to: 'pages#show', id: 'help/faq/index', as: 'faq' # Static pages - get '/blog' => redirect("http://blog.consul/") resources :pages, path: '/', only: [:show] end diff --git a/db/dev_seeds/settings.rb b/db/dev_seeds/settings.rb index cc03a4315..9ef356694 100644 --- a/db/dev_seeds/settings.rb +++ b/db/dev_seeds/settings.rb @@ -23,7 +23,6 @@ section "Creating Settings" do Setting.create(key: 'youtube_handle', value: 'CONSUL') Setting.create(key: 'telegram_handle', value: 'CONSUL') Setting.create(key: 'instagram_handle', value: 'CONSUL') - Setting.create(key: 'blog_url', value: '/blog') Setting.create(key: 'url', value: 'http://localhost:3000') Setting.create(key: 'org_name', value: 'CONSUL') Setting.create(key: 'place_name', value: 'City') diff --git a/db/seeds.rb b/db/seeds.rb index 7d424fe28..5995515b3 100644 --- a/db/seeds.rb +++ b/db/seeds.rb @@ -51,9 +51,6 @@ Setting["facebook_handle"] = nil Setting["youtube_handle"] = nil Setting["telegram_handle"] = nil Setting["instagram_handle"] = nil -Setting["blog_url"] = nil -Setting["transparency_url"] = nil -Setting["opendata_url"] = "/opendata" # Public-facing URL of the app. Setting["url"] = "http://example.com"