Merge pull request #586 from coopdevs/develop

v3.2.0
coopdevs · Jan 8, 2021 · 4001cf9 · 4001cf9
2 parents de812fb + 439b11c
commit 4001cf9
Show file tree

Hide file tree

Showing 29 changed files with 98 additions and 182 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/decorators/post_report_decorator.rb b/app/decorators/post_report_decorator.rb
@@ -14,6 +14,7 @@ def name(extension)
 
   def headers
     [
+      "",
       @type.model_name.human,
       User.model_name.human
     ]
@@ -23,10 +24,11 @@ def rows
     grouped_rows = []
 
     @collection.each do |category, posts|
-      grouped_rows << [category.try(:name) || "-", ""]
+      grouped_rows << ["", category.try(:name) || "-", ""]
 
       posts.each do |post|
         grouped_rows << [
+          post.id,
           post.title,
           "#{post.user} (#{post.member_uid})"
         ]

diff --git a/app/views/application/_navbar.html.erb b/app/views/application/_navbar.html.erb
@@ -52,11 +52,31 @@
       <div class="row">
         <div class="col-xs-12 col-sm-12 col-md-12 col-lg-12">
           <ul class="nav nav-pills actions-menu">
-            <%= render 'application/menus/user_list_link' %>
-            <%= render 'application/menus/offers_list_link' %>
-            <%= render 'application/menus/inquiries_list_link' %>
+            <li class="<%= "active" if current_page?(users_path) %>">
+              <%= link_to users_path do %>
+                <%= glyph :user %>
+                <%= t("users.index.members") %>
+              <% end %>
+            </li>
+            <li class="<%= "active" if current_page?(offers_path) %>">
+              <%= link_to offers_path do %>
+                <%= glyph :offer %>
+                <%= Offer.model_name.human(count: :many) %>
+              <% end %>
+            </li>
+            <li class="<%= "active" if current_page?(inquiries_path) %>">
+              <%= link_to inquiries_path do %>
+                <%= glyph :inquiry %>
+                <%= Inquiry.model_name.human(count: :many) %>
+              <% end %>
+            </li>
             <% if current_user.manages? current_organization %>
-              <%= render 'application/menus/offers_by_tag_link' %>
+              <li class="<%= "active" if current_page?(alpha_grouped_index_tags_path(post_type: "offer")) %>">
+                <%= link_to alpha_grouped_index_tags_path(post_type: "offer") do %>
+                  <%= glyph :tags %>
+                  <%= t ".tags" %>
+                <% end %>
+              </li>
               <%= render 'application/menus/organization_reports_menu' %>
               <%= render 'application/menus/organization_statistics_menu' %>
               <%= render 'application/menus/organization_listings_menu' %>

diff --git a/app/views/application/menus/_inquiries_list_link.html.erb b/app/views/application/menus/_inquiries_list_link.html.erb
diff --git a/app/views/application/menus/_offers_by_tag_link.html.erb b/app/views/application/menus/_offers_by_tag_link.html.erb
diff --git a/app/views/application/menus/_offers_list_link.html.erb b/app/views/application/menus/_offers_list_link.html.erb
diff --git a/app/views/application/menus/_organization_switcher.html.erb b/app/views/application/menus/_organization_switcher.html.erb
diff --git a/app/views/application/menus/_user_admin_menu_items.html.erb b/app/views/application/menus/_user_admin_menu_items.html.erb
@@ -1,5 +1,16 @@
 <% if current_user.organizations.count > 1 %>
-  <%= render 'application/menus/organization_switcher' %>
+  <li class="disabled">
+    <a href="#"><%= current_organization.name %></a>
+  </li>
+  <% (current_user.organizations - [current_organization]).each do |org| %>
+    <li>
+      <%= link_to set_current_organization_path(org), method: :post do %>
+        <%= glyph(:retweet) %>
+        <%= org.name %>
+      <% end %>
+    </li>
+  <% end %>
+
   <li class="divider" role="presentation"></li>
 <% end %>
 

diff --git a/app/views/application/menus/_user_list_link.html.erb b/app/views/application/menus/_user_list_link.html.erb
diff --git a/app/views/inquiries/index.js.erb b/app/views/inquiries/index.js.erb
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/offers/index.js.erb b/app/views/offers/index.js.erb
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/reports/post_list.html.erb b/app/views/reports/post_list.html.erb
@@ -6,17 +6,19 @@
     </colgroup>
     <thead>
       <tr>
+        <th></th>
         <th><%= @post_type.model_name.human %></th>
         <th><%= User.model_name.human %></th>
       </tr>
     </thead>
     <tbody>
       <% @posts.each do |cat, ps| %>
-        <tr class="success">
-          <td colspan="2"><h4><%= cat || '—' %></h4></td>
+        <tr class="info">
+          <td colspan="3"><h4><%= cat || '—' %></h4></td>
         </tr>
         <% ps.each do |post| %>
           <tr>
+            <td><%= post.id %></td>
             <td><strong><%= post.title %></strong></td>
             <td><%= "#{post.user} (#{post.member_uid})" %></td>
           </tr>

diff --git a/app/views/reports/user_list.html.erb b/app/views/reports/user_list.html.erb
@@ -2,8 +2,6 @@
   <table class="table table-condensed table-bordered table-striped">
     <thead>
       <tr>
-        <!-- %th= User.human_attribute_name(:registration_number)
-        -->
         <th>N</th>
         <th><%= User.human_attribute_name :username %></th>
         <th><%= User.human_attribute_name :email %></th>
@@ -22,6 +20,5 @@
         </tr>
       <% end %>
     </tbody>
-    <tfoot></tfoot>
   </table>
 </div>
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