From d49b6e5aa4e7de920e71d568b2ec4d45b2444cf4 Mon Sep 17 00:00:00 2001 From: decabeza Date: Wed, 17 May 2017 14:10:38 +0200 Subject: [PATCH 1/7] adds rel canonical on show views --- app/views/budgets/groups/show.html.erb | 4 ++++ app/views/budgets/investments/index.html.erb | 3 +++ app/views/budgets/investments/show.html.erb | 3 +++ app/views/budgets/show.html.erb | 4 ++++ app/views/debates/show.html.erb | 4 ++++ app/views/proposals/show.html.erb | 4 ++++ 6 files changed, 22 insertions(+) diff --git a/app/views/budgets/groups/show.html.erb b/app/views/budgets/groups/show.html.erb index 27d747c64..a5850481d 100644 --- a/app/views/budgets/groups/show.html.erb +++ b/app/views/budgets/groups/show.html.erb @@ -1,3 +1,7 @@ +<% content_for :canonical do %> + <%= render "shared/canonical", href: budget_group_url(filter: @current_filter) %> +<% end %> +
diff --git a/app/views/budgets/investments/index.html.erb b/app/views/budgets/investments/index.html.erb index 95b60f55b..40515bb99 100644 --- a/app/views/budgets/investments/index.html.erb +++ b/app/views/budgets/investments/index.html.erb @@ -4,6 +4,9 @@ search_path: budget_investments_path(budget_id: @budget.id, page: 1), i18n_namespace: "budgets.investments.index.search_form" %> <% end %> +<% content_for :canonical do %> + <%= render "shared/canonical", href: budget_investments_url(@budget, heading_id: @heading.id, filter: @current_filter) %> +<% end %>
diff --git a/app/views/budgets/investments/show.html.erb b/app/views/budgets/investments/show.html.erb index be33605b0..73861697e 100644 --- a/app/views/budgets/investments/show.html.erb +++ b/app/views/budgets/investments/show.html.erb @@ -1,4 +1,7 @@ <% provide :title do %><%= @investment.title %><% end %> +<% content_for :canonical do %> + <%= render "shared/canonical", href: budget_investment_url %> +<% end %> <%= render partial: '/budgets/investments/investment_show', locals: { investment: @investment, diff --git a/app/views/budgets/show.html.erb b/app/views/budgets/show.html.erb index 84b7691f3..6cd74849d 100644 --- a/app/views/budgets/show.html.erb +++ b/app/views/budgets/show.html.erb @@ -1,3 +1,7 @@ +<% content_for :canonical do %> + <%= render "shared/canonical", href: budget_url(@budget, filter: @current_filter) %> +<% end %> +
diff --git a/app/views/debates/show.html.erb b/app/views/debates/show.html.erb index 532181928..7ca7b0e35 100644 --- a/app/views/debates/show.html.erb +++ b/app/views/debates/show.html.erb @@ -1,4 +1,8 @@ <% provide :title do %><%= @debate.title %><% end %> +<% content_for :canonical do %> + <%= render "shared/canonical", href: debate_url(@debate) %> +<% end %> + <% cache [locale_and_user_status(@debate), @debate, @debate.author, Flag.flagged?(current_user, @debate), @debate_votes] do %>
diff --git a/app/views/proposals/show.html.erb b/app/views/proposals/show.html.erb index ca187d717..93a3e2f73 100644 --- a/app/views/proposals/show.html.erb +++ b/app/views/proposals/show.html.erb @@ -5,6 +5,10 @@ social_title: @proposal.title, social_description: @proposal.summary %> <% end %> +<% content_for :canonical do %> + <%= render "shared/canonical", href: proposal_url(@proposal) %> +<% end %> + <% cache [locale_and_user_status(@proposal), @proposal, @proposal.author, Flag.flagged?(current_user, @proposal), @proposal_votes] do %>
From b6521e932cd323fc79c067ed5bbaa14d8ade26ca Mon Sep 17 00:00:00 2001 From: decabeza Date: Wed, 17 May 2017 14:10:47 +0200 Subject: [PATCH 2/7] adds rel canonical on welcome index page --- app/views/welcome/index.html.erb | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/app/views/welcome/index.html.erb b/app/views/welcome/index.html.erb index 1eb6cf38c..dc5686997 100644 --- a/app/views/welcome/index.html.erb +++ b/app/views/welcome/index.html.erb @@ -1,3 +1,7 @@ +<% content_for :canonical do %> + <%= render "shared/canonical", href: root_url %> +<% end %> +
From 12ebb97a9390f788502fdcc80b0d5b20a88a1468 Mon Sep 17 00:00:00 2001 From: decabeza Date: Wed, 17 May 2017 14:17:41 +0200 Subject: [PATCH 3/7] adds rel canonical on static pages --- app/views/pages/accessibility.html.erb | 4 ++++ app/views/pages/census_terms.html.erb | 4 ++++ app/views/pages/conditions.html.erb | 3 +++ app/views/pages/general_terms.html.erb | 4 ++++ app/views/pages/more_info/how_to_use/index.html.erb | 4 ++++ app/views/pages/more_info/participation/facts.html.erb | 4 ++++ app/views/pages/more_info/participation/world.html.erb | 4 ++++ app/views/pages/privacy.html.erb | 3 +++ 8 files changed, 30 insertions(+) diff --git a/app/views/pages/accessibility.html.erb b/app/views/pages/accessibility.html.erb index a0f54760d..13c51869b 100644 --- a/app/views/pages/accessibility.html.erb +++ b/app/views/pages/accessibility.html.erb @@ -1,4 +1,8 @@ <% provide :title do %><%= t('pages.titles.accessibility') %><% end %> +<% content_for :canonical do %> + <%= render "shared/canonical", href: page_url("accessibility") %> +<% end %> +

Accesibilidad

diff --git a/app/views/pages/census_terms.html.erb b/app/views/pages/census_terms.html.erb index ff57d094a..4134e33b7 100644 --- a/app/views/pages/census_terms.html.erb +++ b/app/views/pages/census_terms.html.erb @@ -1,3 +1,7 @@ +<% content_for :canonical do %> + <%= render "shared/canonical", href: page_url("census_terms") %> +<% end %> +
diff --git a/app/views/pages/conditions.html.erb b/app/views/pages/conditions.html.erb index fbe53c1ca..7a1e5ac54 100644 --- a/app/views/pages/conditions.html.erb +++ b/app/views/pages/conditions.html.erb @@ -1,4 +1,7 @@ <% provide :title do %><%= t('pages.titles.conditions') %><% end %> +<% content_for :canonical do %> + <%= render "shared/canonical", href: page_url("conditions") %> +<% end %>
diff --git a/app/views/pages/general_terms.html.erb b/app/views/pages/general_terms.html.erb index 72e6f4046..9404e6718 100644 --- a/app/views/pages/general_terms.html.erb +++ b/app/views/pages/general_terms.html.erb @@ -1,3 +1,7 @@ +<% content_for :canonical do %> + <%= render "shared/canonical", href: page_url("general_terms") %> +<% end %> +
diff --git a/app/views/pages/more_info/how_to_use/index.html.erb b/app/views/pages/more_info/how_to_use/index.html.erb index 9c6ccfb00..515631352 100644 --- a/app/views/pages/more_info/how_to_use/index.html.erb +++ b/app/views/pages/more_info/how_to_use/index.html.erb @@ -1,3 +1,7 @@ +<% content_for :canonical do %> + <%= render "shared/canonical", href: how_to_use_url %> +<% end %> +
<%= render "shared/back_link" %> diff --git a/app/views/pages/more_info/participation/facts.html.erb b/app/views/pages/more_info/participation/facts.html.erb index 9a52f6a6c..14d23f0ef 100644 --- a/app/views/pages/more_info/participation/facts.html.erb +++ b/app/views/pages/more_info/participation/facts.html.erb @@ -1,3 +1,7 @@ +<% content_for :canonical do %> + <%= render "shared/canonical", href: participation_facts_url %> +<% end %> +
<%= render "shared/back_link" %> diff --git a/app/views/pages/more_info/participation/world.html.erb b/app/views/pages/more_info/participation/world.html.erb index 38ab0275d..e0deac9f9 100644 --- a/app/views/pages/more_info/participation/world.html.erb +++ b/app/views/pages/more_info/participation/world.html.erb @@ -1,3 +1,7 @@ +<% content_for :canonical do %> + <%= render "shared/canonical", href: participation_world_url %> +<% end %> +
<%= render "shared/back_link" %> diff --git a/app/views/pages/privacy.html.erb b/app/views/pages/privacy.html.erb index 3ecbc0a4b..c7824b96c 100644 --- a/app/views/pages/privacy.html.erb +++ b/app/views/pages/privacy.html.erb @@ -1,4 +1,7 @@ <% provide :title do %><%= t('pages.titles.privacy') %><% end %> +<% content_for :canonical do %> + <%= render "shared/canonical", href: page_url("privacy") %> +<% end %>
From b9b806511935316924631a92998b67a7a3fca770 Mon Sep 17 00:00:00 2001 From: decabeza Date: Wed, 17 May 2017 14:18:18 +0200 Subject: [PATCH 4/7] fixes faq's page extension --- app/views/pages/more_info/faq/{index.html => index.html.erb} | 4 ++++ 1 file changed, 4 insertions(+) rename app/views/pages/more_info/faq/{index.html => index.html.erb} (89%) diff --git a/app/views/pages/more_info/faq/index.html b/app/views/pages/more_info/faq/index.html.erb similarity index 89% rename from app/views/pages/more_info/faq/index.html rename to app/views/pages/more_info/faq/index.html.erb index f48864a91..e6deee33e 100644 --- a/app/views/pages/more_info/faq/index.html +++ b/app/views/pages/more_info/faq/index.html.erb @@ -1,3 +1,7 @@ +<% content_for :canonical do %> + <%= render "shared/canonical", href: faq_url %> +<% end %> +
<%= render "shared/back_link" %> From e80cb2ac02254080564b056747f60786dbe196f4 Mon Sep 17 00:00:00 2001 From: decabeza Date: Wed, 17 May 2017 14:20:30 +0200 Subject: [PATCH 5/7] adds rel nofollow on external footer links --- app/views/layouts/_footer.html.erb | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/app/views/layouts/_footer.html.erb b/app/views/layouts/_footer.html.erb index b96d34625..ed6027618 100644 --- a/app/views/layouts/_footer.html.erb +++ b/app/views/layouts/_footer.html.erb @@ -7,8 +7,8 @@

<%= t("layouts.footer.description", - open_source: link_to(t("layouts.footer.open_source"), t("layouts.footer.open_source_url"), target: "blank"), - consul: link_to(t("layouts.footer.consul"), t("layouts.footer.consul_url"), target: "blank")).html_safe + open_source: link_to(t("layouts.footer.open_source"), t("layouts.footer.open_source_url"), target: "blank", rel: "nofollow"), + consul: link_to(t("layouts.footer.consul"), t("layouts.footer.consul_url"), target: "blank", rel: "nofollow")).html_safe %> <%= t("layouts.footer.contact_us") %> <%= link_to t("layouts.footer.faq"), faq_path %> From 2b4a50c56bfa21127b71e3c4b192d3a91a1a13c8 Mon Sep 17 00:00:00 2001 From: decabeza Date: Wed, 17 May 2017 16:58:50 +0200 Subject: [PATCH 6/7] changes rel canonical if budget heading is not present --- app/views/budgets/investments/index.html.erb | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) diff --git a/app/views/budgets/investments/index.html.erb b/app/views/budgets/investments/index.html.erb index 40515bb99..4c6871826 100644 --- a/app/views/budgets/investments/index.html.erb +++ b/app/views/budgets/investments/index.html.erb @@ -5,7 +5,11 @@ i18n_namespace: "budgets.investments.index.search_form" %> <% end %> <% content_for :canonical do %> - <%= render "shared/canonical", href: budget_investments_url(@budget, heading_id: @heading.id, filter: @current_filter) %> + <% if @heading.present? %> + <%= render "shared/canonical", href: budget_investments_url(@budget, heading_id: @heading.id, filter: @current_filter) %> + <% else %> + <%= render "shared/canonical", href: budget_investments_url(@budget) %> + <% end %> <% end %>

From edaf420f50384818181c2786f9ec5f381877d6b9 Mon Sep 17 00:00:00 2001 From: decabeza Date: Wed, 17 May 2017 17:07:53 +0200 Subject: [PATCH 7/7] adds more disallow urls on robots.txt --- public/robots.txt | 2 ++ 1 file changed, 2 insertions(+) diff --git a/public/robots.txt b/public/robots.txt index 57ffebd13..c4f9f1a99 100644 --- a/public/robots.txt +++ b/public/robots.txt @@ -10,3 +10,5 @@ Disallow: /comments/ Disallow: /*?*locale Disallow: /*?*order Disallow: /*?*search +Disallow: /*?*locale-switcher +Disallow: user_id