Skip to content
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
6 changes: 0 additions & 6 deletions .gitignore
Original file line number Diff line number Diff line change
Expand Up @@ -7,10 +7,6 @@
# Ignore bundler config
/.bundle

# Ignore the default SQLite database.
/db/*.sqlite3
/db/*.sqlite3-journal

# Ignore all logfiles and tempfiles.
/log/*.log
/tmp
Expand All @@ -32,8 +28,6 @@ capybara-*.html
/vendor/bundle
/coverage/
/spec/tmp/*
timeoverflow_development
timeoverflow_test
.byebug_history
.env
.DS_Store
Expand Down
4 changes: 4 additions & 0 deletions app/assets/javascripts/application.js
Original file line number Diff line number Diff line change
Expand Up @@ -23,3 +23,7 @@ $(document).on('click', 'span.show-password', function(event) {
$(this).prev('input').attr('type', inputType);
$(this).find('.material-icons').html(icon);
});

$(function() {
$("#select2").select2();
});
31 changes: 2 additions & 29 deletions app/assets/stylesheets/application.scss
Original file line number Diff line number Diff line change
Expand Up @@ -223,7 +223,6 @@ html {
padding: 20px;
}


.row.exports {
padding: 10px;
}
Expand Down Expand Up @@ -352,17 +351,6 @@ label[required]::after{
}
}

.back-overlay {
background-color: $black;
background-size: cover;
display: none;
height: 100%;
position: absolute;
top: 0;
width: 100%;
z-index: -1;
}

.navbar .container-fluid {
padding: 0;
}
Expand Down Expand Up @@ -402,12 +390,6 @@ label[required]::after{
background-size: cover;
}

.back-overlay {
display: block;
filter: alpha(opacity = 60); /* For IE8 and earlier */
opacity: 0.2;
}

.login-wrapper {
position: absolute;
top: 51%;
Expand Down Expand Up @@ -455,11 +437,6 @@ label[required]::after{
background: image-url('home_back_mobile.jpg') no-repeat center center fixed;
background-size: cover;
}

.back-overlay {
filter: alpha(opacity = 15); /* For IE8 and earlier */
opacity: 0.15;
}
}

.landing-page .content, .pages .banner {
Expand Down Expand Up @@ -586,11 +563,7 @@ label[required]::after{
margin-top: 1.5rem;
}

.back-overlay {
display: none;
}

.header, .banner, .empower, .donate {
.header, .banner, .section-block {
text-align: center;
}

Expand Down Expand Up @@ -672,7 +645,7 @@ label[required]::after{
}
}

.empower, .donate {
.section-block {
h2 {
margin-bottom: 4rem;
}
Expand Down
2 changes: 0 additions & 2 deletions app/assets/stylesheets/application/variables.scss
Original file line number Diff line number Diff line change
Expand Up @@ -9,7 +9,6 @@ $palette-black: #333;
$bg-color: #f5f8fa;
$white: #ffffff;
$border: #e1e8ed;
$menu-disabled: #ddd;
$black: #000;
$form-input-glyph: #555;
$form-input-bg-color: #f5f5f5;
Expand All @@ -26,4 +25,3 @@ $pages-anchor: #4a4a4a;
$pages-anchor-hover: #8a8a8a;
$features-background: #f5f5f5;
$features-separator: #d8d8d8;

2 changes: 0 additions & 2 deletions app/views/layouts/application.html.erb
Original file line number Diff line number Diff line change
Expand Up @@ -27,7 +27,5 @@

<%= render_brand_logo %>
<%= render 'application/footer' %>

<div class="back-overlay"></div>
</body>
</html>
18 changes: 3 additions & 15 deletions app/views/pages/about.html.erb
Original file line number Diff line number Diff line change
Expand Up @@ -36,7 +36,7 @@
</div>
</div>
<div class="row">
<div class="col-sm-10 col-sm-offset-1 empower">
<div class="col-sm-10 col-sm-offset-1 section-block">
<h2><%= t("pages.about.empower-title") %></h2>
<p><%= t(
"pages.about.empower-text-1",
Expand Down Expand Up @@ -70,19 +70,7 @@
</div>
</div>
<div class="row">
<div class="col-sm-10 col-sm-offset-1 donate">
<h2><%= t("pages.about.donate-title") %></h2>
<p><%= t(
"pages.about.donate-text",
donate_link: link_to(
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">
<div class="col-sm-10 col-sm-offset-1 section-block">
<h2><%= t("pages.about.app-mobile") %></h2>
<p><%= t(
"pages.about.app-mobile-text",
Expand All @@ -93,7 +81,7 @@
).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>
Expand Down
7 changes: 0 additions & 7 deletions app/views/shared/_post_form.html.erb
Original file line number Diff line number Diff line change
Expand Up @@ -58,10 +58,3 @@
</p>
<%= f.button label_button, class: "btn btn-default", style: "margin-bottom: 20px;" %>
<% end %>
<script>
$("#select2").select2({
formatNoMatches: function () {
return "<%= j t('application.tips.user_not_found') %>";
}
});
</script>
2 changes: 1 addition & 1 deletion app/views/transfers/_sources.html.erb
Original file line number Diff line number Diff line change
Expand Up @@ -4,6 +4,6 @@
options_for_select(
TransferSourcesOptions.new(sources).to_a,
selected: current_user.member(current_organization).account.id
), {}, id: "select2-time", class: "form-control"
), {}, id: "select2", class: "form-control"
%>
</div>
8 changes: 0 additions & 8 deletions app/views/transfers/new.html.erb
Original file line number Diff line number Diff line change
Expand Up @@ -40,11 +40,3 @@
<label class="js-error-amount error invisible"><%= t ".error_amount" %></label>
</div>
<% end %>

<script type="text/javascript">
$("#select2-time").select2({
formatNoMatches: function() {
return "<%= j t('application.tips.user_not_found') %>";
}
});
</script>
3 changes: 0 additions & 3 deletions config/locales/ca.yml
Original file line number Diff line number Diff line change
Expand Up @@ -403,9 +403,6 @@ ca:
banner-button: Sol·licita accés
banner-subtitle: Us ajudarem a posar-lo en marxa o fer-vos una demostració
banner-title: Ets un Banc de Temps?
donate-link: Dona 1€ al mes
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ó
empower-adbdt: ADBdT
empower-adbdt-title: Associació pel Desenvolupament dels Bancs de Temps
empower-coopdevs: CoopDevs
Expand Down
49 changes: 23 additions & 26 deletions config/locales/en.yml
Original file line number Diff line number Diff line change
Expand Up @@ -224,20 +224,20 @@ en:
registrations:
destroyed: Bye! Your account was successfully cancelled. We hope to see you again soon.
edit:
cancel_account:
current_password:
edit_user:
help_current_password:
help_password:
password:
password_confirmation:
unhappy:
update:
cancel_account:
current_password:
edit_user:
help_current_password:
help_password:
password:
password_confirmation:
unhappy:
update:
new:
password:
password_confirmation:
sign_me_up:
sign_up:
password:
password_confirmation:
sign_me_up:
sign_up:
signed_up: Welcome! You have signed up successfully.
signed_up_but_inactive: You have signed up successfully. However, we could not sign you in because your account is not yet activated.
signed_up_but_locked: You have signed up successfully. However, we could not sign you in because your account is locked.
Expand Down Expand Up @@ -335,14 +335,14 @@ en:
report:
report_title: REPORT
locales:
ar:
ar:
ca: Catalan
en: English
es: Spanish
eu:
fr:
gl:
pt:
eu:
fr:
gl:
pt:
pt-BR: Portuguese
mailers_globals:
footer:
Expand Down Expand Up @@ -382,9 +382,6 @@ en:
banner-button: Request access to TimeOverflow
banner-subtitle: We will contact you to start it up or make you a demonstration
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
empower-adbdt: ADBdT
empower-adbdt-title: Association for the Development of Time Banks
empower-coopdevs: CoopDevs
Expand Down Expand Up @@ -579,8 +576,8 @@ en:
active_ago: Active %{time} ago
views:
pagination:
first:
last:
next:
previous:
truncate:
first:
last:
next:
previous:
truncate:
3 changes: 0 additions & 3 deletions config/locales/es.yml
Original file line number Diff line number Diff line change
Expand Up @@ -403,9 +403,6 @@ es:
banner-button: Solicita acceso
banner-subtitle: Os ayudaremos a ponerlo en marcha o a haceros una demostración
banner-title: "¿Eres un Banco de Tiempo?"
donate-link: Donar 1€ al mes
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
empower-adbdt: ADBdT
empower-adbdt-title: Asociación para el Desarrollo de los Bancos de Tiempo
empower-coopdevs: CoopDevs
Expand Down
35 changes: 16 additions & 19 deletions config/locales/eu.yml
Original file line number Diff line number Diff line change
Expand Up @@ -411,9 +411,6 @@ eu:
banner-button: Sartzea eskatzen du
banner-subtitle: Martxan jartzen edo erakustaldi bat eginez lagunduko dizugu
banner-title: Denbora banku bat al zara?
donate-link: Eman ezazu hilean €1
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
empower-adbdt: ADBdt
empower-adbdt-title: Denbora Bankuen garapenerako elkartea
empower-coopdevs: CoopDevs
Expand All @@ -440,7 +437,7 @@ eu:
title2: Denbora bankuentzat
posts:
show:
info:
info:
reports:
cat_with_users:
title: Eskaintzen diren zerbitzuak
Expand All @@ -452,8 +449,8 @@ eu:
delete_reason: Zihur zaude , azalpen hau ezabatu nahi duzula?
movements: Mugimenduak
post_form:
group_inquiry:
group_offer:
group_inquiry:
group_offer:
you_can_use: Erabil dezakezu
simple_form:
error_notification:
Expand All @@ -465,7 +462,7 @@ eu:
female: Emakumea
male: Gizona
others: Beste
prefer_not_to_answer:
prefer_not_to_answer:
required:
mark: "*"
text: Beharrezkoa
Expand Down Expand Up @@ -532,7 +529,7 @@ eu:
one: "%{count}minutu"
other: "%{count} minutu"
new:
error_amount:
error_amount:
users:
edit:
edit_user: Erabiltzailea aldatu
Expand All @@ -542,18 +539,18 @@ eu:
give_time: honi denbora eman
index:
actions: Ekintzak
active_warning:
active_warning:
active_warning_angular: " {{username}} erabiltzailearen kontuaren egoera, aldatuko duzu."
cancel_warning:
cancel_warning:
cancel_warning_angular: " {{username}} erabiltzailea D bankutik ezabatuko duzu."
create: Erabiltzaile berria sortu
manage_warning:
manage_warning:
manage_warning_angular: " {{username}} erabiltzailearen onurak, aldatuko diztuzu"
members: Kideak
user_created: "%{uid} %{name} erabiltzailea gorde da"
member_card:
active_ago:
no_activity:
active_ago:
no_activity:
new:
cancel: Deuseztatu
create_more_users_button: Beste erabiltzaile bat sortu eta sartu
Expand All @@ -564,7 +561,7 @@ eu:
accounts: Kontuak
balance: 'Balantzea:'
categories: Eskainiriko zerbitzuak
change_your_image:
change_your_image:
created_at: 'Alta:'
data: Erabiltzailearen datuak
date: Eguna
Expand All @@ -587,8 +584,8 @@ eu:
manage_warning: "%{user} erabiltzailearen onurak aldatuko dituzu"
views:
pagination:
first:
last:
next:
previous:
truncate:
first:
last:
next:
previous:
truncate:
3 changes: 0 additions & 3 deletions config/locales/gl.yml
Original file line number Diff line number Diff line change
Expand Up @@ -403,9 +403,6 @@ gl:
banner-button: Solicitar acceso a TimeOverflow
banner-subtitle: Contamos contigo para poñelo en marcha ou para facerche unha demostración
banner-title: Es ti un Banco de Tempo?
donate-link: Doe 1 € ao mes
donate-text: Para soportar moitas comunidades, a asociación ADBdT ofrece a plataforma TimeOverflow a todos os bancos de tempo. %{donate_link} para contribuír aos custos de mantemento e innovación.
donate-title: Participa cunha doazón
empower-adbdt: ADBdT
empower-adbdt-title: Asociación para o Desenvolvemento de Bancos de Tempo
empower-coopdevs: CoopDevs
Expand Down
Loading