diff --git a/app/assets/stylesheets/application.css b/app/assets/stylesheets/application.css index 50e6b85..ac76fc2 100644 --- a/app/assets/stylesheets/application.css +++ b/app/assets/stylesheets/application.css @@ -1,7 +1,7 @@ /* Application styles */ body { - max-width: 800px; + max-width: 1000px; margin: 0 auto; } @@ -25,3 +25,6 @@ ul { li { padding: 5px 0px; } table.noborder { border: 0; margin: 0; } + +nav ul { display: flex; flex-wrap: wrap; padding: 10px; list-style-type: none; gap: 20px; } +nav ul li { margin: 0; padding: 0; } diff --git a/app/views/members/index.html.erb b/app/views/members/index.html.erb index 762c99e..2417481 100644 --- a/app/views/members/index.html.erb +++ b/app/views/members/index.html.erb @@ -72,6 +72,7 @@ <% end %> +

<%= t('members.index.results_count', count: @members.size) %>

@@ -92,12 +93,7 @@ <% end %> diff --git a/app/views/members/show.html.erb b/app/views/members/show.html.erb index fff5b22..ac4a26f 100644 --- a/app/views/members/show.html.erb +++ b/app/views/members/show.html.erb @@ -3,7 +3,7 @@

<%= t('members.show.title') %>

<%= member.joined_on %> <%= member.expires_on %> -
    -
  • <%= link_to t('members.index.actions.show'), member %>
  • -
  • <%= link_to t('members.index.actions.edit'), edit_member_path(member) %>
  • -
  • <%= link_to t('members.index.actions.new_contribution'), new_member_contribution_path(member) %>
  • -
  • <%= link_to t('members.index.actions.delete'), delete_member_path(member) %>
  • -
+ <%= link_to t('members.index.actions.show'), member %>
- + @@ -13,13 +13,16 @@ - - + +
<%= t('members.attributes.display_name') %><%= @member.display_name %>
<%= t('members.attributes.display_name') %><%= @member.number %>. <%= @member.display_name %>
<%= t('members.attributes.email') %><%= @member.email %>
<%= t('members.attributes.category') %><%= @member.category %>
<%= t('members.attributes.identification_number') %><%= @member.identification_number %>
<%= t('members.attributes.joined_on') %><%= @member.joined_on %>
<%= t('members.attributes.expires_on') %><%= @member.expires_on %>
<%= t('members.attributes.status') %><%= @member.status %>
<%= t('members.attributes.regular_ifthenpay_link') %><%= link_to @member.regular_ifthenpay_link, @member.regular_ifthenpay_link %>
<%= t('members.attributes.reduced_ifthenpay_link') %><%= link_to @member.reduced_ifthenpay_link, @member.reduced_ifthenpay_link %>
<%= t('members.attributes.regular_ifthenpay_link') %><% if @member.regular_ifthenpay_link %><%= link_to @member.regular_ifthenpay_link, @member.regular_ifthenpay_link %><% end %>
<%= t('members.attributes.reduced_ifthenpay_link') %><% if @member.reduced_ifthenpay_link %><%= link_to @member.reduced_ifthenpay_link, @member.reduced_ifthenpay_link %><% end %>
<%= link_to t('members.show.actions.edit'), edit_member_path(@member) %>
+
+ <%= link_to t('members.show.actions.delete'), delete_member_path(@member) %> +

<%= t('members.show.contribution_history') %>

diff --git a/config/locales/pt.yml b/config/locales/pt.yml index ea9140e..b76d419 100644 --- a/config/locales/pt.yml +++ b/config/locales/pt.yml @@ -19,6 +19,7 @@ pt: go_back: "Cancelar" index: title: "Membros" + results_count: "A mostrar %{count} membros:" actions: new: "Registar novo membro" clear_search: "" @@ -30,6 +31,7 @@ pt: title: "Detalhes de membro" actions: edit: "Editar detalhes" + delete: "Apagar dados pessoais permanentemente" edit_contribution: "Editar" delete_contribution: "Apagar" deliver_notification: "Enviar agora"