Merge pull request #575 from coopdevs/remove_donation_info

delete donation block in about page
coopdevs · Jan 8, 2021 · 640cd29 · 640cd29
2 parents e78459b + e5e046e
commit 640cd29
Show file tree

Hide file tree

Showing 16 changed files with 52 additions and 130 deletions.
diff --git a/.gitignore b/.gitignore
@@ -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
@@ -32,8 +28,6 @@ capybara-*.html
 /vendor/bundle
 /coverage/
 /spec/tmp/*
-timeoverflow_development
-timeoverflow_test
 .byebug_history
 .env
 .DS_Store

diff --git a/app/assets/javascripts/application.js b/app/assets/javascripts/application.js
@@ -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();
+});
diff --git a/app/assets/stylesheets/application.scss b/app/assets/stylesheets/application.scss
@@ -223,7 +223,6 @@ html {
   padding: 20px;
 }
 
-
 .row.exports {
   padding: 10px;
 }
@@ -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;
 }
@@ -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%;
@@ -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 {
@@ -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;
   }
 
@@ -672,7 +645,7 @@ label[required]::after{
     }
   }
 
-  .empower, .donate {
+  .section-block {
     h2 {
       margin-bottom: 4rem;
     }

diff --git a/app/assets/stylesheets/application/variables.scss b/app/assets/stylesheets/application/variables.scss
@@ -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;
@@ -26,4 +25,3 @@ $pages-anchor: #4a4a4a;
 $pages-anchor-hover: #8a8a8a;
 $features-background: #f5f5f5;
 $features-separator: #d8d8d8;
-
diff --git a/app/views/layouts/application.html.erb b/app/views/layouts/application.html.erb
@@ -27,7 +27,5 @@
 
     <%= render_brand_logo %>
     <%= render 'application/footer' %>
-
-    <div class="back-overlay"></div>
   </body>
 </html>
diff --git a/app/views/pages/about.html.erb b/app/views/pages/about.html.erb
@@ -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",
@@ -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",
@@ -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>

diff --git a/app/views/shared/_post_form.html.erb b/app/views/shared/_post_form.html.erb
@@ -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>
diff --git a/app/views/transfers/_sources.html.erb b/app/views/transfers/_sources.html.erb
@@ -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>
diff --git a/app/views/transfers/new.html.erb b/app/views/transfers/new.html.erb
@@ -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>
diff --git a/config/locales/ca.yml b/config/locales/ca.yml
@@ -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

diff --git a/config/locales/en.yml b/config/locales/en.yml
@@ -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.
@@ -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:
@@ -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
@@ -579,8 +576,8 @@ en:
       active_ago: Active %{time} ago
   views:
     pagination:
-      first: 
-      last: 
-      next: 
-      previous: 
-      truncate: 
+      first:
+      last:
+      next:
+      previous:
+      truncate:
diff --git a/config/locales/es.yml b/config/locales/es.yml
@@ -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

diff --git a/config/locales/eu.yml b/config/locales/eu.yml
@@ -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
@@ -440,7 +437,7 @@ eu:
       title2: Denbora bankuentzat
   posts:
     show:
-      info: 
+      info:
   reports:
     cat_with_users:
       title: Eskaintzen diren zerbitzuak
@@ -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:
@@ -465,7 +462,7 @@ eu:
           female: Emakumea
           male: Gizona
           others: Beste
-          prefer_not_to_answer: 
+          prefer_not_to_answer:
     required:
       mark: "*"
       text: Beharrezkoa
@@ -532,7 +529,7 @@ eu:
         one: "%{count}minutu"
         other: "%{count} minutu"
     new:
-      error_amount: 
+      error_amount:
   users:
     edit:
       edit_user: Erabiltzailea aldatu
@@ -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
@@ -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
@@ -587,8 +584,8 @@ eu:
       manage_warning: "%{user} erabiltzailearen onurak aldatuko dituzu"
   views:
     pagination:
-      first: 
-      last: 
-      next: 
-      previous: 
-      truncate: 
+      first:
+      last:
+      next:
+      previous:
+      truncate:
diff --git a/config/locales/gl.yml b/config/locales/gl.yml
@@ -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