Small UI improvements

- Don't show dead ifthenpay link if there isn't one
- Remove actions from members#index in favor of members#show
- Display result count in members#index
- Increase table width in members#index

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

app/views/members/index.html.erb

@@ -72,6 +72,7 @@
   </fieldset>
 <% end %>
 
+<p><%= t('members.index.results_count', count: @members.size) %></p>
 
 <table class='zebra'>
   <tr>
@@ -92,12 +93,7 @@
       <td><%= member.joined_on %></td>
       <td><%= member.expires_on %></td>
       <td>
-        <ul>
-          <li><%= link_to t('members.index.actions.show'), member %></li>
-          <li><%= link_to t('members.index.actions.edit'), edit_member_path(member) %></li>
-          <li><%= link_to t('members.index.actions.new_contribution'), new_member_contribution_path(member) %></li>
-          <li><%= link_to t('members.index.actions.delete'), delete_member_path(member) %></li>
-        </ul>
+        <%= link_to t('members.index.actions.show'), member %>
       </td>
     </tr>
   <% end %>

app/views/members/show.html.erb

@@ -3,7 +3,7 @@
 <h1><%= t('members.show.title') %></h1>
 
 <table class='lined'>
-  <tr><td><%= t('members.attributes.display_name') %></td><td><%= @member.display_name %></td></tr>
+  <tr><td><%= t('members.attributes.display_name') %></td><td><%= @member.number %>. <%= @member.display_name %></td></tr>
   <tr><td><%= t('members.attributes.email') %></td><td><%= @member.email %></td></tr>
   <tr><td><%= t('members.attributes.category') %></td><td><%= @member.category %></td></tr>
   <tr><td><%= t('members.attributes.identification_number') %></td><td><%= @member.identification_number %></td></tr>
@@ -13,13 +13,16 @@
   <tr><td><%= t('members.attributes.joined_on') %></td><td><%= @member.joined_on %></td></tr>
   <tr><td><%= t('members.attributes.expires_on') %></td><td><%= @member.expires_on %></td></tr>
   <tr><td><%= t('members.attributes.status') %></td><td><%= @member.status %></td></tr>
-  <tr><td><%= t('members.attributes.regular_ifthenpay_link') %></td><td><%= link_to @member.regular_ifthenpay_link, @member.regular_ifthenpay_link %></td></tr>
-  <tr><td><%= t('members.attributes.reduced_ifthenpay_link') %></td><td><%= link_to @member.reduced_ifthenpay_link, @member.reduced_ifthenpay_link %></td></tr>
+  <tr><td><%= t('members.attributes.regular_ifthenpay_link') %></td><td><% if @member.regular_ifthenpay_link %><%= link_to @member.regular_ifthenpay_link, @member.regular_ifthenpay_link %><% end %></td></tr>
+  <tr><td><%= t('members.attributes.reduced_ifthenpay_link') %></td><td><% if @member.reduced_ifthenpay_link %><%= link_to @member.reduced_ifthenpay_link, @member.reduced_ifthenpay_link %><% end %></td></tr>
 </table>
 
 <div>
   <%= link_to t('members.show.actions.edit'), edit_member_path(@member) %>
 </div>
+<div>
+  <%= link_to t('members.show.actions.delete'), delete_member_path(@member) %>
+</div>
 
 <h2><%= t('members.show.contribution_history') %></h2>
 

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"