consul/nairobi
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Remove margin bottom in the table inside accordion. Divided into groups of 10 interests. Inserted interests in columns.

Browse Source
This commit is contained in:
Alessandro Cuoghi
2017-07-03 12:14:00 +02:00
committed by Senén Rodero Rodríguez
parent 7e2e94d709
commit 556e2598c3
4 changed files with 10 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

1
app/assets/stylesheets/layout.scss
View File

@@ -1964,6 +1964,7 @@ table {
table { table {
border: 0; border: 0;
margin-bottom: 0;
} }
td { td {

2
app/controllers/users_controller.rb
View File

@@ -3,11 +3,11 @@ class UsersController < ApplicationController
load_and_authorize_resource load_and_authorize_resource
helper_method :author? helper_method :author?
helper_method :valid_interests_access?
helper_method :author_or_admin? helper_method :author_or_admin?
def show def show
load_filtered_activity if valid_access? load_filtered_activity if valid_access?
load_interests if valid_interests_access?
end end
private private

7
app/views/users/_proposal.html.erb
View File

@@ -5,12 +5,15 @@
<%= proposal.summary %> <%= proposal.summary %>
</td> </td>
<% if author? %> <% if can? :retire_form, proposal %>
<td class="text-center"> <td class="text-center">
<%= link_to t("users.proposals.send_notification"), new_proposal_notification_path(proposal_id: proposal.id), <%= link_to t("users.proposals.send_notification"),
new_proposal_notification_path(proposal_id: proposal.id),
class: 'button hollow' %> class: 'button hollow' %>
</td> </td>
<% end %>
<% if can? :new, ProposalNotification, author_id: proposal.author_id %>
<td class="text-center"> <td class="text-center">
<% if proposal.retired? %> <% if proposal.retired? %>
<span class="label alert"><%= t('users.proposals.retired') %></span> <span class="label alert"><%= t('users.proposals.retired') %></span>

2
app/views/users/show.html.erb
View File

@@ -46,7 +46,7 @@
<p><%= t('users.show.private_activity') %></p> <p><%= t('users.show.private_activity') %></p>
<% end %> <% end %>
<% if @user.public_interests || @authorized_current_user %> <% if valid_interests_access? %>
<div id="public_interests" class="public-interests"> <div id="public_interests" class="public-interests">
<h4><%= t('account.show.public_interests_title_list') %></h4> <h4><%= t('account.show.public_interests_title_list') %></h4>
<% @user.interests.in_groups_of(10, false) do |interests_group| %> <% @user.interests.in_groups_of(10, false) do |interests_group| %>