Merge pull request #586 from coopdevs/develop

v3.2.0

Author: sseerrggii

.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

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();
+});

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;
     }

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;
-

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})"
         ]

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' %>