diff --git a/app/views/layouts/_admin_header.html.erb b/app/views/layouts/_admin_header.html.erb index 7dcdabc77..797797aa6 100644 --- a/app/views/layouts/_admin_header.html.erb +++ b/app/views/layouts/_admin_header.html.erb @@ -11,7 +11,7 @@
  • <%= 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") %> | <%= t("admin.dashboard.index.title") %> + <%= Setting['org_name'] %> | <%= t("admin.dashboard.index.title") %> <% end %>
    • diff --git a/app/views/layouts/_footer.html.erb b/app/views/layouts/_footer.html.erb index 6f1bd3f81..d7c31d6da 100644 --- a/app/views/layouts/_footer.html.erb +++ b/app/views/layouts/_footer.html.erb @@ -53,21 +53,29 @@
    - <%= link_to "https://twitter.com/abriendomadrid", target: "_blank", title: t("social.twitter") do %> - <%= t("social.twitter") %> - + <% if Setting['twitter_handle'] %> + <%= link_to "https://twitter.com/#{Setting['twitter_handle']}", target: "_blank", title: t("social.twitter") do %> + <%= t("social.twitter") %> + + <% end %> <% end %> - <%= link_to "https://www.facebook.com/Abriendo-Madrid-1475577616080350/", target: "_blank", title: t("social.facebook") do %> - <%= t("social.facebook") %> - + <% if Setting['facebook_handle'] %> + <%= link_to "https://www.facebook.com/#{Setting['facebook_handle']}/", target: "_blank", title: t("social.facebook") do %> + <%= t("social.facebook") %> + + <% end %> <% end %> - <%= link_to "/blog", target: "_blank", title: t("social.blog") do %> - <%= t("social.blog") %> - + <% if Setting['blog_url'] %> + <%= link_to Setting['blog_url'], target: "_blank", title: t("social.blog") do %> + <%= t("social.blog") %> + + <% end %> <% end %> - <%= link_to "https://www.youtube.com/channel/UCFmaChI9quIY7lwHplnacfg", target: "_blank", title: t("social.youtube") do %> - <%= t("social.youtube") %> - + <% if Setting['youtube_handle'] %> + <%= link_to "https://www.youtube.com/#{Setting['youtube_handle']}", target: "_blank", title: t("social.youtube") do %> + <%= t("social.youtube") %> + + <% end %> <% end %>
    diff --git a/app/views/layouts/_header.html.erb b/app/views/layouts/_header.html.erb index a48ff8dbd..75e41c192 100644 --- a/app/views/layouts/_header.html.erb +++ b/app/views/layouts/_header.html.erb @@ -3,7 +3,7 @@
    <%= render "shared/locale_switcher" %>
    - <%= link_to t("layouts.header.participation_html"), root_path, class: ("selected" unless current_page?("/opendata")) %> | + <%= link_to Setting['org_name'], root_path, class: ("selected" unless current_page?("/opendata")) %> | <%= link_to t("layouts.header.external_link_transparency"), t("layouts.header.external_link_transparency_url") %> | <%= link_to t("layouts.header.external_link_opendata"), "/opendata", class: ("selected" if current_page?("/opendata")) %>
    @@ -21,7 +21,7 @@ <%= t("layouts.header.open_gov", open: "#{t('layouts.header.open')}") %> | <%= t("layouts.header.open_data") %> <% else %> - <%= t("layouts.header.participation_html") %> + <%= Setting['org_name'] %> <% end %> <% end %> @@ -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") %> - + <% if Setting['blog_url'] %> + <%= link_to Setting['blog_url'], target: "_blank" do %> + <%= t("layouts.header.external_link_blog") %> + + <% end %> <% end %>
    diff --git a/app/views/layouts/application.html.erb b/app/views/layouts/application.html.erb index a03649616..c0050e107 100644 --- a/app/views/layouts/application.html.erb +++ b/app/views/layouts/application.html.erb @@ -4,7 +4,7 @@ - <%= content_for?(:title) ? yield(:title) : "Gobierno abierto" %> + <%= content_for?(:title) ? yield(:title) : Setting['org_name'] %> <%= 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) %> diff --git a/app/views/layouts/mailer.html.erb b/app/views/layouts/mailer.html.erb index 015afafc9..94fc4d231 100644 --- a/app/views/layouts/mailer.html.erb +++ b/app/views/layouts/mailer.html.erb @@ -14,7 +14,7 @@ - <%= 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']) %> @@ -31,7 +31,7 @@

    - Ayuntamiento de Madrid

    + <%= Setting['org_name'] %>

    diff --git a/app/views/layouts/management.html.erb b/app/views/layouts/management.html.erb index d2bf19a84..31d674ec4 100644 --- a/app/views/layouts/management.html.erb +++ b/app/views/layouts/management.html.erb @@ -29,7 +29,7 @@
  • <%= link_to management_root_path do %> <%= image_tag('header_logo_madrid.png', class: 'left', size: '96x96') %> - <%= t("layouts.header.participation_html") %> | <%= t("management.dashboard.index.title") %> + <%= Setting['org_name'] %> | <%= t("management.dashboard.index.title") %> <% end %>
    • diff --git a/app/views/proposals/_featured_votes.html.erb b/app/views/proposals/_featured_votes.html.erb index bda617e96..e828b7fb5 100644 --- a/app/views/proposals/_featured_votes.html.erb +++ b/app/views/proposals/_featured_votes.html.erb @@ -35,8 +35,10 @@ <% end %> <% if voted_for?(@featured_proposals_votes, proposal) %> -
    - <%= social_share_button_tag(proposal.title, url: proposal_url(proposal), via: "AbriendoMadrid") %> -
    + <% if Setting['twitter_handle'] %> +
    + <%= social_share_button_tag(proposal.title, url: proposal_url(proposal), via: Setting['twitter_handle']) %> +
    + <% end %> <% end %> -
    \ No newline at end of file + diff --git a/app/views/proposals/_votes.html.erb b/app/views/proposals/_votes.html.erb index 7d0116599..9a7c18dce 100644 --- a/app/views/proposals/_votes.html.erb +++ b/app/views/proposals/_votes.html.erb @@ -51,9 +51,9 @@ <% end %> - <% if voted_for?(@proposal_votes, proposal) %> + <% if voted_for?(@proposal_votes, proposal) && Setting['twitter_handle'] %>
    - <%= 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']) %>
    <% end %> diff --git a/app/views/shared/_social_media_meta_tags.html.erb b/app/views/shared/_social_media_meta_tags.html.erb index 57d43fe2f..07dff0ed8 100644 --- a/app/views/shared/_social_media_meta_tags.html.erb +++ b/app/views/shared/_social_media_meta_tags.html.erb @@ -6,11 +6,15 @@ - - +<% if Setting['url'] %> + +<% end %> +<% if Setting['facebook_handle'] %> + +<% end %> - + - \ No newline at end of file + diff --git a/config/locales/en.yml b/config/locales/en.yml index dd62006d5..06c2be639 100755 --- a/config/locales/en.yml +++ b/config/locales/en.yml @@ -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 diff --git a/config/locales/es.yml b/config/locales/es.yml index 6bcb7c4af..3a7ab7669 100644 --- a/config/locales/es.yml +++ b/config/locales/es.yml @@ -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 diff --git a/db/seeds.rb b/db/seeds.rb index aab253e8c..c8c0351de 100644 --- a/db/seeds.rb +++ b/db/seeds.rb @@ -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"