consul/nairobi
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge pull request #1583 from consul/seo-improvements

Browse Source 
SEO improvements
This commit is contained in:
Juanjo Bazán
2017-05-31 14:21:14 +02:00
committed by GitHub
parent a1452497be 773f3d658a
commit acd7b76f49
14 changed files with 58 additions and 47 deletions
Download Patch File Download Diff File Expand all files Collapse all files

BIN
app/assets/images/icon_home_debate.png
View File

Binary file not shown.
Side by Side

Before

Width:  |  Height:  |  Size: 8.9 KiB

BIN
app/assets/images/icon_home_decide.png
View File

Binary file not shown.
Side by Side

Before

Width:  |  Height:  |  Size: 4.4 KiB

BIN
app/assets/images/icon_home_do.png
View File

Binary file not shown.
Side by Side

Before

Width:  |  Height:  |  Size: 6.7 KiB

BIN
app/assets/images/icon_home_proposal.png
View File

Binary file not shown.
Side by Side

Before

Width:  |  Height:  |  Size: 6.8 KiB

5
app/assets/stylesheets/layout.scss
View File

@@ -648,11 +648,12 @@ footer {
} }
} }
h2.sidebar-title { .sidebar-title {
border-top: 2px solid $brand; border-top: 2px solid $brand;
display: inline-block; display: inline-block;
font-size: rem-calc(16); font-size: rem-calc(16);
margin: -1px 0 rem-calc(12); font-weight: bold;
margin: -1px 0 $line-height/2;
padding-top: $line-height/4; padding-top: $line-height/4;
text-transform: uppercase; text-transform: uppercase;
} }

42
app/views/layouts/_footer.html.erb
View File

@@ -48,49 +48,55 @@
<ul> <ul>
<% if setting['twitter_handle'] %> <% if setting['twitter_handle'] %>
<li class="inline-block"> <li class="inline-block">
<%= link_to "https://twitter.com/#{setting['twitter_handle']}", target: "_blank", title: t("social.twitter") + t('shared.target_blank_html'), rel: "nofollow" do %> <%= link_to "https://twitter.com/#{setting['twitter_handle']}", target: "_blank",
<span class="sr-only"><%= t("social.twitter") %></span> title: t("shared.go_to_page") + t("social.twitter", org: setting['org_name']) + t('shared.target_blank_html') do %>
<span class="icon-twitter" aria-hidden="true"></span> <span class="sr-only"><%= t("social.twitter, org: setting['org_name']") %></span>
<span class="icon-twitter" aria-hidden="true"></span>
<% end %> <% end %>
</li> </li>
<% end %> <% end %>
<% if setting['facebook_handle'] %> <% if setting['facebook_handle'] %>
<li class="inline-block"> <li class="inline-block">
<%= link_to "https://www.facebook.com/#{setting['facebook_handle']}/", target: "_blank", title: t("social.facebook") + t('shared.target_blank_html'), rel: "nofollow" do %> <%= link_to "https://www.facebook.com/#{setting['facebook_handle']}/", target: "_blank",
<span class="sr-only"><%= t("social.facebook") %></span> title: t("shared.go_to_page") + t("social.facebook", org: setting['org_name']) + t('shared.target_blank_html') do %>
<span class="icon-facebook" aria-hidden="true"></span> <span class="sr-only"><%= t("social.facebook, org: setting['org_name']") %></span>
<span class="icon-facebook" aria-hidden="true"></span>
<% end %> <% end %>
</li> </li>
<% end %> <% end %>
<% if setting['blog_url'] %> <% if setting['blog_url'] %>
<li class="inline-block"> <li class="inline-block">
<%= link_to setting['blog_url'], target: "_blank", title: t("social.blog") + t('shared.target_blank_html'), rel: "nofollow" do %> <%= link_to setting['blog_url'], target: "_blank",
<span class="sr-only"><%= t("social.blog") %></span> title: t("shared.go_to_page") + t("social.blog", org: setting['org_name']) + t('shared.target_blank_html') do %>
<span class="icon-blog" aria-hidden="true"></span> <span class="sr-only"><%= t("social.blog, org: setting['org_name']") %></span>
<span class="icon-blog" aria-hidden="true"></span>
<% end %> <% end %>
</li> </li>
<% end %> <% end %>
<% if setting['youtube_handle'] %> <% if setting['youtube_handle'] %>
<li class="inline-block"> <li class="inline-block">
<%= link_to "https://www.youtube.com/#{setting['youtube_handle']}", target: "_blank", title: t("social.youtube") + t('shared.target_blank_html'), rel: "nofollow" do %> <%= link_to "https://www.youtube.com/#{setting['youtube_handle']}", target: "_blank",
<span class="sr-only"><%= t("social.youtube") %></span> title: t("shared.go_to_page") + t("social.youtube", org: setting['org_name']) + t('shared.target_blank_html') do %>
<span class="icon-youtube" aria-hidden="true"></span> <span class="sr-only"><%= t("social.youtube", org: setting['org_name']) %></span>
<span class="icon-youtube" aria-hidden="true"></span>
<% end %> <% end %>
</li> </li>
<% end %> <% end %>
<% if setting['telegram_handle'] %> <% if setting['telegram_handle'] %>
<li class="inline-block"> <li class="inline-block">
<%= link_to "https://www.telegram.me/#{setting['telegram_handle']}", target: "_blank", title: t("social.telegram") + t('shared.target_blank_html'), rel: "nofollow" do %> <%= link_to "https://www.telegram.me/#{setting['telegram_handle']}", target: "_blank",
<span class="sr-only"><%= t("social.telegram") %></span> title: t("shared.go_to_page") + t("social.telegram", org: setting['org_name']) + t('shared.target_blank_html') do %>
<span class="icon-telegram" aria-hidden="true"></span> <span class="sr-only"><%= t("social.telegram") %></span>
<span class="icon-telegram" aria-hidden="true"></span>
<% end %> <% end %>
</li> </li>
<% end %> <% end %>
<% if setting['instagram_handle'] %> <% if setting['instagram_handle'] %>
<li class="inline-block"> <li class="inline-block">
<%= link_to "https://www.instagram.com/#{setting['instagram_handle']}", target: "_blank", title: t("social.instagram") + t('shared.target_blank_html'), rel: "nofollow" do %> <%= link_to "https://www.instagram.com/#{setting['instagram_handle']}", target: "_blank",
<span class="sr-only"><%= t("social.instagram") %></span> title: t("shared.go_to_page") + t("social.instagram", org: setting['org_name']) + t('shared.target_blank_html') do %>
<span class="icon-instagram" aria-hidden="true"></span> <span class="sr-only"><%= t("social.instagram", org: setting['org_name']) %></span>
<span class="icon-instagram" aria-hidden="true"></span>
<% end %> <% end %>
</li> </li>
<% end %> <% end %>

2
app/views/proposals/index.html.erb
View File

@@ -69,8 +69,8 @@
<aside class="margin-bottom"> <aside class="margin-bottom">
<%= link_to t("proposals.index.start_proposal"), new_proposal_path, class: 'button expanded' %> <%= link_to t("proposals.index.start_proposal"), new_proposal_path, class: 'button expanded' %>
<% if params[:retired].blank? %> <% if params[:retired].blank? %>
<%= render "shared/tag_cloud", taggable: 'proposal' %>
<%= render 'categories' %> <%= render 'categories' %>
<%= render "shared/tag_cloud", taggable: 'proposal' %>
<%= render 'geozones' %> <%= render 'geozones' %>
<%= render 'popular' %> <%= render 'popular' %>
<% end %> <% end %>

1
app/views/proposals/show.html.erb
View File

@@ -1,4 +1,5 @@
<% provide :title do %><%= @proposal.title %><% end %> <% provide :title do %><%= @proposal.title %><% end %>
<% content_for :meta_description do %><%= @proposal.summary %><% end %>
<% provide :social_media_meta_tags do %> <% provide :social_media_meta_tags do %>
<%= render "shared/social_media_meta_tags", <%= render "shared/social_media_meta_tags",
social_url: proposal_url(@proposal), social_url: proposal_url(@proposal),

2
app/views/shared/_social_share.html.erb
View File

@@ -1,6 +1,6 @@
<% if local_assigns[:share_title].present? %> <% if local_assigns[:share_title].present? %>
<div id="social-share" class="sidebar-divider"></div> <div id="social-share" class="sidebar-divider"></div>
<h2><%= share_title %></h2> <p class="sidebar-title"><%= share_title %></p>
<% end %> <% end %>
<div class="social-share-full"> <div class="social-share-full">
<%= social_share_button_tag("#{title} #{setting['twitter_hashtag']}") %> <%= social_share_button_tag("#{title} #{setting['twitter_hashtag']}") %>

15
app/views/shared/_subnavigation.html.erb
View File

@@ -5,21 +5,24 @@
<%= layout_menu_link_to t("layouts.header.debates"), <%= layout_menu_link_to t("layouts.header.debates"),
debates_path, debates_path,
controller_name == 'debates', controller_name == 'debates',
accesskey: "1" %> accesskey: "1",
title: t("shared.go_to_page") + t("layouts.header.debates") %>
</li> </li>
<% end %> <% end %>
<li> <li>
<%= layout_menu_link_to t("layouts.header.proposals"), <%= layout_menu_link_to t("layouts.header.proposals"),
proposals_path, proposals_path,
controller_name == 'proposals', controller_name == 'proposals',
accesskey: "2" %> accesskey: "2",
title: t("shared.go_to_page") + t("layouts.header.proposals") %>
</li> </li>
<% if feature?(:polls) %> <% if feature?(:polls) %>
<li> <li>
<%= layout_menu_link_to t("layouts.header.poll_questions"), <%= layout_menu_link_to t("layouts.header.poll_questions"),
polls_path, polls_path,
controller_name == "polls", controller_name == "polls",
accesskey: "3" %> accesskey: "3",
title: t("shared.go_to_page") + t("layouts.header.poll_questions") %>
</li> </li>
<% end %> <% end %>
<% if feature?(:spending_proposals) %> <% if feature?(:spending_proposals) %>
@@ -35,14 +38,16 @@
<%= layout_menu_link_to t("layouts.header.budgets"), <%= layout_menu_link_to t("layouts.header.budgets"),
budgets_path, budgets_path,
controller_name == "budgets" || controller_name == "investments", controller_name == "budgets" || controller_name == "investments",
accesskey: "4" %> accesskey: "4",
title: t("shared.go_to_page") + t("layouts.header.budgets") %>
</li> </li>
<% end %> <% end %>
<li> <li>
<%= link_to t("layouts.header.more_info"), <%= link_to t("layouts.header.more_info"),
more_info_path, more_info_path,
accesskey: "5", accesskey: "5",
class: ("active" if current_page?(more_info_path)) %> class: ("active" if current_page?(more_info_path)),
title: t("shared.go_to_page") + t("layouts.header.more_info") %>
</li> </li>
</ul> </ul>
</div> </div>

6
app/views/shared/_top_links.html.erb
View File

@@ -4,14 +4,14 @@
setting['transparency_url'].presence || t("layouts.header.external_link_transparency_url"), setting['transparency_url'].presence || t("layouts.header.external_link_transparency_url"),
target: "_blank", target: "_blank",
rel: "nofollow", rel: "nofollow",
title: t('shared.target_blank_html') %> title: t("shared.go_to_page") + t("layouts.header.external_link_transparency") + t('shared.target_blank_html') %>
</li> </li>
<li> <li>
<%= link_to t("layouts.header.external_link_opendata"), <%= link_to t("layouts.header.external_link_opendata"),
setting['opendata_url'].presence || t("layouts.header.external_link_opendata_url"), setting['opendata_url'].presence || t("layouts.header.external_link_opendata_url"),
target: "_blank", target: "_blank",
rel: "nofollow", rel: "nofollow",
title: t('shared.target_blank_html') %> title: t("shared.go_to_page") + t("layouts.header.external_link_opendata") + t('shared.target_blank_html') %>
</li> </li>
<% if setting['blog_url'] %> <% if setting['blog_url'] %>
@@ -20,7 +20,7 @@
setting['blog_url'], setting['blog_url'],
target: "_blank", target: "_blank",
rel: "nofollow", rel: "nofollow",
title: t('shared.target_blank_html') %> title: t("shared.go_to_page") + t("layouts.header.external_link_blog") + t('shared.target_blank_html') %>
</li> </li>
<% end %> <% end %>

4
app/views/welcome/index.html.erb
View File

@@ -25,24 +25,20 @@
<main> <main>
<div class="row text-center margin"> <div class="row text-center margin">
<div class="small-12 medium-3 column"> <div class="small-12 medium-3 column">
<%= image_tag("icon_home_debate.png", size: "168x168", alt: "", title: t("welcome.debates.title")) %>
<h2><%= t("welcome.debates.title") %></h2> <h2><%= t("welcome.debates.title") %></h2>
<p><%= t("welcome.debates.description") %></p> <p><%= t("welcome.debates.description") %></p>
</div> </div>
<div class="small-12 medium-3 column"> <div class="small-12 medium-3 column">
<%= image_tag("icon_home_proposal.png", size: "168x168", alt: "", title: t("welcome.proposal.title")) %>
<h2><%= t("welcome.proposal.title") %></h2> <h2><%= t("welcome.proposal.title") %></h2>
<p><%= t("welcome.proposal.description") %></p> <p><%= t("welcome.proposal.description") %></p>
</div> </div>
<div class="small-12 medium-3 column"> <div class="small-12 medium-3 column">
<%= image_tag("icon_home_decide.png", size: "168x168", alt: "", title: t("welcome.decide.title")) %>
<h2><%= t("welcome.decide.title") %></h2> <h2><%= t("welcome.decide.title") %></h2>
<p><%= t("welcome.decide.description") %></p> <p><%= t("welcome.decide.description") %></p>
</div> </div>
<div class="small-12 medium-3 column"> <div class="small-12 medium-3 column">
<%= image_tag("icon_home_do.png", size: "168x168", alt: "", title: t("welcome.do.title")) %>
<h2><%= t("welcome.do.title") %></h2> <h2><%= t("welcome.do.title") %></h2>
<p><%= t("welcome.do.description") %></p> <p><%= t("welcome.do.description") %></p>
</div> </div>

13
config/locales/en.yml
View File

@@ -527,14 +527,15 @@ en:
proposals: Proposals proposals: Proposals
budget: Participatory budget budget: Participatory budget
searcher: Searcher searcher: Searcher
go_to_page: "Go to page of "
social: social:
blog: Blog blog: "%{org} Blog"
facebook: Facebook facebook: "%{org} Facebook"
twitter: Twitter twitter: "%{org} Twitter"
youtube: YouTube youtube: "%{org} YouTube"
whatsapp: WhatsApp whatsapp: WhatsApp
telegram: Telegram telegram: "%{org} Telegram"
instagram: Instagram instagram: "%{org} Instagram"
spending_proposals: spending_proposals:
form: form:
association_name_label: 'If you propose in name of an assocation or collective add the name here' association_name_label: 'If you propose in name of an assocation or collective add the name here'

15
config/locales/es.yml
View File

@@ -527,14 +527,15 @@ es:
proposals: Propuestas proposals: Propuestas
budget: Presupuestos participativos budget: Presupuestos participativos
searcher: Buscador searcher: Buscador
go_to_page: "Ir a la página de "
social: social:
blog: Blog blog: "Blog de %{org}"
facebook: Facebook facebook: "Facebook de %{org}"
twitter: Twitter twitter: "Twitter de %{org}"
youtube: YouTube youtube: "YouTube de %{org}"
whatsapp: WhatsApp whatsapp: WhatsApp
telegram: Telegram telegram: "Telegram de %{org}"
instagram: Instagram instagram: "Instagram de %{org}"
spending_proposals: spending_proposals:
form: form:
association_name_label: 'Si propones en nombre de una asociación o colectivo añade el nombre aquí' association_name_label: 'Si propones en nombre de una asociación o colectivo añade el nombre aquí'
@@ -703,4 +704,4 @@ es:
alt: "Selecciona el texto que quieres comentar y pulsa en el botón con el lápiz." alt: "Selecciona el texto que quieres comentar y pulsa en el botón con el lápiz."
invisible_captcha: invisible_captcha:
sentence_for_humans: "Si eres humano, por favor ignora este campo" sentence_for_humans: "Si eres humano, por favor ignora este campo"
timestamp_error_message: "Eso ha sido demasiado rápido. Por favor, reenvía el formulario." timestamp_error_message: "Eso ha sido demasiado rápido. Por favor, reenvía el formulario."