Skip to content

add logo ajuntament BCN and Mobile app info, #393

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 2 commits into from
Aug 8, 2018
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
Binary file added app/assets/images/ajuntament_bcn_activa.png
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
30 changes: 24 additions & 6 deletions app/views/pages/about.html.erb
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
<div class="container-inner">
<div class="row">
<div class="col-xs-10 col-sm-10 col-md-6 col-lg-6 col-xs-offset-1 col-sm-offset-1 col-md-offset-3 col-lg-offset-3 header">
<h2><%== t("pages.about.title") %><span><%== t("pages.about.title2") %></span></h2>
<h2><%= t("pages.about.title") %><span><%= t("pages.about.title2") %></span></h2>
<h3><%= t("pages.about.subtitle") %></h3>
</div>
</div>
Expand Down Expand Up @@ -38,15 +38,15 @@
<div class="row">
<div class="col-sm-10 col-sm-offset-1 empower">
<h2><%= t("pages.about.empower-title") %></h2>
<p><%== t(
<p><%= t(
"pages.about.empower-text-1",
showmap_link: link_to(
t("pages.about.empower-showmap"),
"http://www.bdtonline.org",
{ title: t("pages.about.empower-showmap-title") }
)
).html_safe %></p>
<p><%== t(
<p><%= t(
"pages.about.empower-text-2",
coopdevs_link: link_to(
t("pages.about.empower-coopdevs"),
Expand All @@ -59,7 +59,7 @@
{ title: t("pages.about.empower-adbdt-title") }
)
).html_safe %></p>
<p><%== t(
<p><%= t(
"pages.about.empower-text-3",
github_link: link_to(
t("pages.about.empower-github"),
Expand All @@ -72,13 +72,31 @@
<div class="row">
<div class="col-sm-10 col-sm-offset-1 donate">
<h2><%= t("pages.about.donate-title") %></h2>
<p><%== t(
<p><%= t(
"pages.about.donate-text",
donate_link: link_to(
t("pages.about.donate_link"),
t("pages.about.donate-link"),
"https://www.teaming.net/poreldesarrollodelosbancosdetiempo",
)
).html_safe %></p>
</div>
</div>
<div class="row">
<div class="col-sm-10 col-sm-offset-1 donate">
<h2><%= t("pages.about.app-mobile") %></h2>
<p><%= t(
"pages.about.app-mobile-text",
impulsem_link: link_to(
t("pages.about.impulsem-link"),
"https://empreses.barcelonactiva.cat/ca/web/es/impulsem-el-que-fas-2017",
)
).html_safe %></p>
</div>
</div>

<div class="row">
<div class="col-sm-12 text-center">
<a href="http://www.barcelonactiva.cat" ><%= image_tag("ajuntament_bcn_activa.png", width: '400', class: "img-responsive center-block") %></a>
</div>
</div>
</div>
2 changes: 1 addition & 1 deletion config/locales/ca.yml
Original file line number Diff line number Diff line change
Expand Up @@ -377,7 +377,7 @@ ca:
banner-title: Ets un Banc de Temps?
donate-text: Amb la finalitat de donar suport a moltes comunitats la associació ADBdT ofereix la plataforma TimeOverflow a tots los Bancs de Temps. Considera %{donate_link} per contribuir a les despeses de manteniment i innovació.
donate-title: Participa amb una donació
donate_link: donar 1€ al mes
donate-link: donar 1€ al mes
empower-adbdt: ADBdT
empower-adbdt-title: Associació pel Desenvolupament dels Bancs de Temps
empower-coopdevs: CoopDevs
Expand Down
5 changes: 4 additions & 1 deletion config/locales/en.yml
Original file line number Diff line number Diff line change
Expand Up @@ -378,7 +378,7 @@ en:
banner-title: Are you a Time Bank?
donate-text: In order to support many communities the ADBdT asociation offers TimeOverflow platform to all Time Banks. %{donate_link} to contribute to maintenance and innovation costs.
donate-title: Participate with a donation
donate_link: Donate 1€ a month
donate-link: Donate 1€ a month
empower-adbdt: ADBdT
empower-adbdt-title: Association for the Development of Time Banks
empower-coopdevs: CoopDevs
Expand All @@ -402,6 +402,9 @@ en:
subtitle: TimeOverflow is open source, free and collaborative
title: The software designed by and for
title2: Time Banks
app-mobile: Mobile App
app-mobile-text: The mobile app TimeOverflow for Android and iOS is available for download. <br /> This app has been possible thanks to the collaboration of the municipality of Barcelona, program %{impulsem_link} (Barcelona Activa) 2017-2018
impulsem-link: "Impulsem el que fas"
posts:
show:
info: "%{type} of %{organization} to see person's details you have to"
Expand Down
2 changes: 1 addition & 1 deletion config/locales/es.yml
Original file line number Diff line number Diff line change
Expand Up @@ -378,7 +378,7 @@ es:
banner-title: "¿Eres un Banco de Tiempo?"
donate-text: Con el fin de apoyar a muchas comunidades la asociación ADBdT ofrece la plataforma TimeOverflow a todos los Bancos de Tiempo. Considera %{donate_link} para contribuir a los gastos de mantenimiento e innovación.
donate-title: Participa con una donación
donate_link: donar 1€ al mes
donate-link: donar 1€ al mes
empower-adbdt: ADBdT
empower-adbdt-title: Asociación para el Desarrollo de los Bancos de Tiempo
empower-coopdevs: CoopDevs
Expand Down
2 changes: 1 addition & 1 deletion config/locales/eu.yml
Original file line number Diff line number Diff line change
Expand Up @@ -383,7 +383,7 @@ eu:
banner-title: Denbora banku bat al zara?
donate-text: komunitate askori babesteko asmotan ADBdt elkarteak , TimeOverflow plataforma eskaintzen die Denbora Banku guztiei. Hausnar ezazu %{donate_link} mantenu eta berritze lanetan laguntzeko.
donate-title: Laguntzan parte hartu
donate_link: Hilean €1 ematea
donate-link: Hilean €1 ematea
empower-adbdt: ADBdt
empower-adbdt-title: Denbora Bankuen garapenerako elkartea
empower-coopdevs: CoopDevs
Expand Down
2 changes: 1 addition & 1 deletion config/locales/pt-BR.yml
Original file line number Diff line number Diff line change
Expand Up @@ -377,7 +377,7 @@ pt-BR:
banner-title: Você é um Banco de Tempo?
donate-text:
donate-title:
donate_link:
donate-link:
empower-adbdt: ADBdt
empower-adbdt-title: Associação para o Desenvolvimento dos Bancos de Tempo
empower-coopdevs: CoopDevs
Expand Down