Parameterize social links

This commit is contained in:
Josep Jaume Rey Peroy
2015-12-10 15:27:38 +01:00
parent 5de3d700e4
commit ba74542c3d
12 changed files with 65 additions and 38 deletions

View File

@@ -11,7 +11,7 @@
<li class="name">
<%= link_to root_path do %>
<%= image_tag('header_logo_madrid.png', class: 'left', size: '96x96', alt: t("layouts.header.logo")) %>
<%= t("layouts.header.participation_html") %> <span>|</span> <span class="logo-site"><%= t("admin.dashboard.index.title") %></span>
<%= Setting['org_name'] %> <span>|</span> <span class="logo-site"><%= t("admin.dashboard.index.title") %></span>
<% end %>
</li>
<li class="toggle-topbar menu-icon"><a href="#"><span></span></a></li>

View File

@@ -53,21 +53,29 @@
</div>
<div class="small-12 medium-3 column social">
<%= link_to "https://twitter.com/abriendomadrid", target: "_blank", title: t("social.twitter") do %>
<span class="sr-only"><%= t("social.twitter") %></span>
<i class="icon-twitter"></i>
<% if Setting['twitter_handle'] %>
<%= link_to "https://twitter.com/#{Setting['twitter_handle']}", target: "_blank", title: t("social.twitter") do %>
<span class="sr-only"><%= t("social.twitter") %></span>
<i class="icon-twitter"></i>
<% end %>
<% end %>
<%= link_to "https://www.facebook.com/Abriendo-Madrid-1475577616080350/", target: "_blank", title: t("social.facebook") do %>
<span class="sr-only"><%= t("social.facebook") %></span>
<i class="icon-facebook"></i>
<% if Setting['facebook_handle'] %>
<%= link_to "https://www.facebook.com/#{Setting['facebook_handle']}/", target: "_blank", title: t("social.facebook") do %>
<span class="sr-only"><%= t("social.facebook") %></span>
<i class="icon-facebook"></i>
<% end %>
<% end %>
<%= link_to "/blog", target: "_blank", title: t("social.blog") do %>
<span class="sr-only"><%= t("social.blog") %></span>
<i class="icon-blog"></i>
<% if Setting['blog_url'] %>
<%= link_to Setting['blog_url'], target: "_blank", title: t("social.blog") do %>
<span class="sr-only"><%= t("social.blog") %></span>
<i class="icon-blog"></i>
<% end %>
<% end %>
<%= link_to "https://www.youtube.com/channel/UCFmaChI9quIY7lwHplnacfg", target: "_blank", title: t("social.youtube") do %>
<span class="sr-only"><%= t("social.youtube") %></span>
<i class="icon-youtube"></i>
<% if Setting['youtube_handle'] %>
<%= link_to "https://www.youtube.com/#{Setting['youtube_handle']}", target: "_blank", title: t("social.youtube") do %>
<span class="sr-only"><%= t("social.youtube") %></span>
<i class="icon-youtube"></i>
<% end %>
<% end %>
</div>
</div>

View File

@@ -3,7 +3,7 @@
<div class="row">
<%= render "shared/locale_switcher" %>
<div class="external-links">
<%= link_to t("layouts.header.participation_html"), root_path, class: ("selected" unless current_page?("/opendata")) %>&nbsp;|
<%= link_to Setting['org_name'], root_path, class: ("selected" unless current_page?("/opendata")) %>&nbsp;|
<%= link_to t("layouts.header.external_link_transparency"), t("layouts.header.external_link_transparency_url") %>&nbsp;|
<%= link_to t("layouts.header.external_link_opendata"), "/opendata", class: ("selected" if current_page?("/opendata")) %>
</div>
@@ -21,7 +21,7 @@
<%= t("layouts.header.open_gov", open: "#{t('layouts.header.open')}") %> <span>|</span>
<span class="logo-site"><%= t("layouts.header.open_data") %></span>
<% else %>
<%= t("layouts.header.participation_html") %>
<%= Setting['org_name'] %>
<% end %>
<% end %>
</li>
@@ -39,9 +39,11 @@
<%= link_to t("layouts.header.proposals"), proposals_path, class: ("active" if controller_name == "proposals") %>
<%= link_to t("layouts.header.spending_proposals"), spending_proposals_path, class: ("active" if controller_name == "spending_proposals") %>
<%= link_to t("layouts.header.more_information"), page_path('more_information'), class: ("active" if current_page?("/more_information")) %>
<%= link_to t("layouts.header.external_link_blog_url"), target: "_blank" do %>
<%= t("layouts.header.external_link_blog") %>
<small><i class="icon-external"></i></small>
<% if Setting['blog_url'] %>
<%= link_to Setting['blog_url'], target: "_blank" do %>
<%= t("layouts.header.external_link_blog") %>
<i class="icon-external"></i>
<% end %>
<% end %>
</div>
<div class="small-12 medium-3 column">

View File

@@ -4,7 +4,7 @@
<meta charset="utf-8" />
<meta name="viewport" content="width=device-width, initial-scale=1.0" />
<meta http-equiv="X-UA-Compatible" content="IE=edge" />
<title><%= content_for?(:title) ? yield(:title) : "Gobierno abierto" %></title>
<title><%= content_for?(:title) ? yield(:title) : Setting['org_name'] %></title>
<%= stylesheet_link_tag "application" %>
<%= javascript_include_tag "vendor/modernizr" %>
<%= javascript_include_tag "application", 'data-turbolinks-track' => true %>
@@ -16,7 +16,7 @@
type: "image/png" %>
<%= content_for :social_media_meta_tags %>
<%= Setting.value_for(:per_page_code).try(:html_safe) %>
<%= Setting['per_page_code'].try(:html_safe) %>
</head>
<body>

View File

@@ -14,7 +14,7 @@
<tr>
<td style="border-bottom: 1px solid #dadfe1; padding: 20px 0;">
<a href="#" target="_blank">
<%= image_tag('logo_email_gobierno_abierto.png', style: "border: 0; display: block; width: 100%;max-width: 370px", alt: "Ayuntamiento de Madrid - Participación ciudadana, transparencia y gobierno abierto") %>
<%= image_tag('logo_email_gobierno_abierto.png', style: "border: 0; display: block; width: 100%;max-width: 370px", alt: Setting['org_name']) %>
</a>
</td>
</tr>
@@ -31,7 +31,7 @@
<tr>
<td style="text-align: center; border-top: 1px solid #dadfe1; padding-top: 20px;">
<p style="font-family: 'Open Sans','Helvetica Neue',arial,sans-serif; margin: 0;padding: 0;line-height: 1.5em;color: #797f7f; font-size: 12px;">
Ayuntamiento de Madrid</p>
<%= Setting['org_name'] %></p>
</td>
</tr>
</tbody>

View File

@@ -29,7 +29,7 @@
<li class="name">
<%= link_to management_root_path do %>
<%= image_tag('header_logo_madrid.png', class: 'left', size: '96x96') %>
<%= t("layouts.header.participation_html") %> <span>|</span> <span class="logo-site"><%= t("management.dashboard.index.title") %></span>
<%= Setting['org_name'] %> <span>|</span> <span class="logo-site"><%= t("management.dashboard.index.title") %></span>
<% end %>
</li>
<li class="toggle-topbar menu-icon"><a href="#"><span></span></a></li>

View File

@@ -35,8 +35,10 @@
<% end %>
<% if voted_for?(@featured_proposals_votes, proposal) %>
<div class="share-supported">
<%= social_share_button_tag(proposal.title, url: proposal_url(proposal), via: "AbriendoMadrid") %>
</div>
<% if Setting['twitter_handle'] %>
<div class="share-supported">
<%= social_share_button_tag(proposal.title, url: proposal_url(proposal), via: Setting['twitter_handle']) %>
</div>
<% end %>
<% end %>
</div>
</div>

View File

@@ -51,9 +51,9 @@
</div>
<% end %>
<% if voted_for?(@proposal_votes, proposal) %>
<% if voted_for?(@proposal_votes, proposal) && Setting['twitter_handle'] %>
<div class="share-supported">
<%= social_share_button_tag(proposal.title, url: proposal_url(proposal), via: "AbriendoMadrid") %>
<%= social_share_button_tag(proposal.title, url: proposal_url(proposal), via: Setting['twitter_handle']) %>
</div>
<% end %>
</div>

View File

@@ -6,11 +6,15 @@
<meta name="twitter:image" content="<%= image_url '/social-media-icon.png' %>" />
<!-- Facebook OG -->
<meta id="ogtitle" property="og:title" content="<%= social_title %>"/>
<meta property="article:publisher" content="http://decide.madrid.es"/>
<meta property="article:author" content="https://www.facebook.com/Ayuntamiento-de-Madrid-770904446353931"/>
<% if Setting['url'] %>
<meta property="article:publisher" content=Setting['url']/>
<% end %>
<% if Setting['facebook_handle'] %>
<meta property="article:author" content="https://www.facebook.com/#{Setting['facebook_handle']}"/>
<% end %>
<meta property="og:type" content="article"/>
<meta id="ogurl" property="og:url" content="<%= social_url %>"/>
<meta id="ogimage" property="og:image" content="<%= image_url '/social-media-icon.png' %>"/>
<meta property="og:site_name" content="Madrid Participación"/>
<meta property="og:site_name" content="<%= Setting['org_name'] %>"/>
<meta id="ogdescription" property="og:description" content="<%= social_description %>"/>
<meta property="fb:app_id" content="1662598980652932"/>
<meta property="fb:app_id" content="1662598980652932"/>

View File

@@ -184,7 +184,6 @@ en:
administration: Administration
debates: Debates
external_link_blog: Blog
external_link_blog_url: "/blog"
external_link_opendata: Open data
external_link_opendata_url: http://datos.madrid.es
external_link_transparency: Transparency
@@ -204,7 +203,6 @@ en:
open_city_title: Love the city, and it will become a city you love.
open_data: Open data
open_gov: Open government
participation_html: Madrid Decide
proposals: Proposals
see_all: See proposals
spending_proposals: Spending proposals

View File

@@ -184,7 +184,6 @@ es:
administration: Administrar
debates: Debates
external_link_blog: Blog
external_link_blog_url: "/blog"
external_link_opendata: Datos abiertos
external_link_opendata_url: http://datos.madrid.es
external_link_transparency: Transparencia
@@ -204,7 +203,6 @@ es:
open_city_title: La ciudad que quieres será la ciudad que quieras.
open_data: Datos abiertos
open_gov: Gobierno %{open}
participation_html: Madrid Decide
proposals: Propuestas
see_all: Ver propuestas
spending_proposals: Presupuestos ciudadanos

View File

@@ -33,4 +33,19 @@ Setting["votes_for_proposal_success"] = 53726
Setting["email_domain_for_officials"] = ''
# Code to be included at the top (header) of every page (useful for tracking)
Setting['per_page_code', value: '']
Setting['per_page_code'] = ''
# Social settings
Setting["twitter_handle"] = nil
Setting["facebook_handle"] = nil
Setting["youtube_handle"] = nil
Setting["blog_url"] = nil
# Public-facing URL of the app.
Setting["url"] = "http://example.com"
# Consul installation's organization name
Setting["org_name"] = "Consul"
# Consul installation place name (City, Country...)
Setting["place_name"] = "Consul-land"