Merge pull request #5398 from Tyler-Fanuele/5372AlignmentNudges2

awwaiid · web-flow · commit 7b2391409ee6 · 2025-09-14T09:29:56.000-04:00
5372 alignment nudges2
diff --git a/app/helpers/kits_helper.rb b/app/helpers/kits_helper.rb
@@ -10,7 +10,7 @@ def deactivate_kit_button(kit, inventory)
     tag.span(**span_options) do
       deactivate_button_to(deactivate_kit_path(kit),
         options.merge({text: "Deactivate",
-          confirm: confirm_deactivate_msg(kit.name), size: "m"}))
+          confirm: confirm_deactivate_msg(kit.name), size: "xs"}))
     end
   end
 end
diff --git a/app/views/adjustments/index.html.erb b/app/views/adjustments/index.html.erb
@@ -80,7 +80,7 @@
                 <th>Storage location</th>
                 <th>Comment</th>
                 <th>Summary</th>
-                <th>&nbsp;</th>
+                <th class="text-right">Actions</th>
               </tr>
               </thead>
               <tbody>
diff --git a/app/views/admin/base_items/_base_item_row.html.erb b/app/views/admin/base_items/_base_item_row.html.erb
@@ -1,6 +1,6 @@
 <tr id="base-item-row-<%= base_item_row.to_param %>">
   <td><%= base_item_row.name %></td>
-  <td><%= base_item_row.item_count %></td>
+  <td class="text-right"><%= base_item_row.item_count %></td>
   <td class="text-right">
     <%= view_button_to admin_base_item_path(base_item_row) %>
     <%= edit_button_to edit_admin_base_item_path(base_item_row) %>
diff --git a/app/views/admin/base_items/index.html.erb b/app/views/admin/base_items/index.html.erb
@@ -32,6 +32,7 @@
               <thead>
               <tr>
                 <th>Name</th>
+                <th class="text-right">Child Items</th>
                 <th>Child Items</th>
                 <th class="text-right">Actions</th>
               </tr>
diff --git a/app/views/admin/organizations/_list.html.erb b/app/views/admin/organizations/_list.html.erb
@@ -4,8 +4,8 @@
       <tr>
         <th>Organization</th>
         <th>Contact E-mail</th>
-        <th class="date">Added On</th>
-      <th class="date">Last Distribution Date</th>
+        <th class="date text-left">Added On</th>
+      <th class="date text-left">Last Distribution Date</th>
         <th class="text-right">Actions</th>
       </tr>
     </thead>
@@ -15,8 +15,8 @@
         <tr>
           <td><%= organization.name %></td>
           <td><%= link_to organization.email, "mailto:#{organization.email}" %></td>
-          <td class="date"><%= organization.created_at.strftime("%F") %></td>
-        <td class="date"><%= organization.display_last_distribution_date %></td>
+          <td class="date text-left"><%= organization.created_at.strftime("%F") %></td>
+        <td class="date text-left"><%= organization.display_last_distribution_date %></td>
           <td class="text-right">
             <%= view_button_to admin_organization_path(organization.id) %>
             <%= delete_button_to(admin_organization_path(organization.id), { confirm: confirm_delete_msg(organization.name) }) unless (Organization.count <= 1) %>
diff --git a/app/views/audits/show.html.erb b/app/views/audits/show.html.erb
@@ -46,7 +46,7 @@
               <tr>
                 <th>Item</th>
                 <th>Audit Quantity</th>
-                <th>Quantity in Records</th>
+                <th class="text-right">Quantity in Records</th>
               </tr>
               </thead>
               <tbody>
@@ -55,7 +55,7 @@
                 <tr class="<%= line_item.nil? ? "negative" : (line_item.quantity.equal?(inventory_item.quantity) ? "positive" : "highlight") %>">
                   <td><%= inventory_item.name %></td>
                   <td><%= line_item&.quantity&.abs || "Not Audited" %></td>
-                  <td><%= inventory_item.quantity %></td>
+                  <td class="text-right"><%= inventory_item.quantity %></td>
                 </tr>
               <% end %>
               </tbody>
diff --git a/app/views/broadcast_announcements/_broadcast_announcement.html.erb b/app/views/broadcast_announcements/_broadcast_announcement.html.erb
@@ -2,7 +2,7 @@
   <td><%= broadcast_announcement.message %></td>
   <td><%= link_to  broadcast_announcement.link, broadcast_announcement.link %></td>
   <td><%= broadcast_announcement.user&.name || "N/A" %></td>
-  <td><%= broadcast_announcement.expiry %>
+  <td class="date text-left"><%= broadcast_announcement.expiry %>
     <% if broadcast_announcement.expired? %>
       <span class="badge badge-danger bg-danger">Expired</span>
     <% end %>
diff --git a/app/views/broadcast_announcements/index.html.erb b/app/views/broadcast_announcements/index.html.erb
@@ -39,8 +39,8 @@
                   <th class="w-50">Announcement</th>
                   <th>More info</th>
                   <th>Sent by</th>
-                  <th>Expiration</th>
-                  <th class="text-center">Actions</th>
+                  <th class="date text-left">Expiration</th>
+                  <th class="text-right">Actions</th>
                 </tr>
               </thead>
               <tbody>
diff --git a/app/views/distributions/_distribution_row.html.erb b/app/views/distributions/_distribution_row.html.erb
@@ -1,13 +1,13 @@
 <tr <%= 'class="highlight"' if distribution_row.id == @highlight_id %>>
   <td><%= distribution_row.id %></td>
   <td><%= distribution_row.partner.name %></td>
-  <td class="date"><%= distribution_row.created_at.strftime("%m/%d/%Y") %></td>
-  <td class="date"><%= (distribution_row.issued_at.presence || distribution_row.created_at).strftime("%m/%d/%Y") %></td>
+  <td class="date text-left"><%= distribution_row.created_at.strftime("%m/%d/%Y") %></td>
+  <td class="date text-left"><%= (distribution_row.issued_at.presence || distribution_row.created_at).strftime("%m/%d/%Y") %></td>
   <td><%= distribution_row.storage_location.name %></td>
   <td class="numeric"><%= @distribution_totals[distribution_row.id].quantity %></td>
   <td class="numeric"><%= dollar_value(@distribution_totals[distribution_row.id].value) %></td>
   <td><%= distribution_row.delivery_method.humanize %></td>
-  <td><%= distribution_shipping_cost(distribution_row.shipping_cost) %></td>
+  <td class="text-right"><%= distribution_shipping_cost(distribution_row.shipping_cost) %></td>
   <td><%= distribution_row.comment %></td>
   <td><%= distribution_row.state&.humanize %></td>
   <% distribution_has_inactive_item = @distributions_with_inactive_items.include?(distribution_row.id) %>
diff --git a/app/views/distributions/index.html.erb b/app/views/distributions/index.html.erb
@@ -99,8 +99,8 @@
               <tr>
                 <th>ID</th>
                 <th>Partner</th>
-                <th class="date">Initial Allocation</th>
-                <th class="date">Date of Distribution</th>
+                <th class="date text-left">Initial Allocation</th>
+                <th class="date text-left">Date of Distribution</th>
                 <th>Source Inventory</th>
 
                 <% filtered_item_name = @selected_item ? @items.find { |i| i.id == filter_params[:by_item_id].to_i }&.name : nil %>
@@ -127,7 +127,7 @@
                 <!-- End Value -->
 
                 <th>Delivery Method</th>
-                <th>Shipping Cost</th>
+                <th class="text-right">Shipping Cost</th>
                 <th>Comments</th>
                 <th>Status</th>
                 <th class="text-right" style="width: 400px">Actions</th>
diff --git a/app/views/kits/_table.html.erb b/app/views/kits/_table.html.erb
@@ -4,7 +4,7 @@
   <th>Name</th>
   <th>Items</th>
   <th>Allocations</th>
-  <th>Actions</th>
+  <th class="text-right">Actions</th>
 </tr>
 </thead>
 <tbody>
@@ -23,19 +23,16 @@
           <thead>
             <tr>
               <td> Storage Location </td>
-              <td> Quantity </td>
+              <td class="text-right"> Quantity </td>
             </tr>
           </thead>
           <% @inventory.all_items.select { |i| i.item_id == kit.item.id}.each do |item| %>
             <tr>
               <td><%= @inventory.storage_location_name(item.storage_location_id) %></td>
-              <td><%= item.quantity %></td>
+              <td class="text-right"><%= item.quantity %></td>
             </tr>
           <% end %>
         </table>
-        <div class='align-self-center'>
-          <%= edit_button_to allocations_kit_path(kit), { text: "Modify Allocation" } %>
-        </div>
       </td>
       <td class="text-right">
         <% if kit.active %>
@@ -44,8 +41,9 @@
           <%= reactivate_button_to reactivate_kit_path(kit),
                                    { confirm: confirm_reactivate_msg(kit.name),
                                      class: 'reactivate-kit-button',
-                                     size: 'm' } %>
+                                     size: 'xs' } %>
         <% end %>
+        <%= edit_button_to allocations_kit_path(kit), { text: "Modify Allocation" } %>
       </td>
     </tr>
   <% end %>
diff --git a/app/views/partners/_partner_row.html.erb b/app/views/partners/_partner_row.html.erb
@@ -5,7 +5,7 @@
   <td class='text-blue-500'><%= link_to partner_row.name, partner_path(partner_row) %></td>
   <td><%= link_to partner_row.email, "mailto:#{partner_row.email}" %></td>
   <td><%= partner_row.partner_group&.name %></td>
-  <td><%= partner_row.quota %></td>
+  <td class="text-right"><%= partner_row.quota %></td>
   <td>
     <% case status %>
     <% when "uninvited" %>
diff --git a/app/views/partners/_partners_table.html.erb b/app/views/partners/_partners_table.html.erb
@@ -29,10 +29,9 @@
                   <th>Partner</th>
                   <th>E-mail</th>
                   <th>Group</th>
-                  <th>Quota</th>
+                  <th class="text-right">Quota</th>
                   <th>Status</th>
                   <th class="text-right">Action</th>
-                  <th>&nbsp;</th>
                 </tr>
               </thead>
               <tbody>
diff --git a/app/views/product_drives/index.html.erb b/app/views/product_drives/index.html.erb
@@ -105,8 +105,8 @@
               <% @paginated_product_drives.each do |product_drive| %>
                 <tr>
                   <td><%= product_drive.name %></td>
-                  <td><%= product_drive.start_date.strftime("%m-%d-%Y") %></td>
-                  <td><%= product_drive.end_date&.strftime("%m-%d-%Y") %></td>
+                  <td class="date text-left"><%= product_drive.start_date.strftime("%m-%d-%Y") %></td>
+                  <td class="date text-left"><%= product_drive.end_date&.strftime("%m-%d-%Y") %></td>
                   <td><%= product_drive.tags_for_display %></td>
                   <td><%= is_virtual(product_drive: product_drive) %></td>
                   <td class="text-right"><%= @summary[product_drive.id].quantity %></td>
diff --git a/app/views/requests/_request_row.html.erb b/app/views/requests/_request_row.html.erb
@@ -5,7 +5,7 @@
     <% partner_user = @partner_users.find { |pu| pu.id == request_row.partner_user_id } %>
     <%= "#{partner_user&.formatted_email}" %>
   </td>
-  <td class="<%= quota_column_class(request_row.total_items, request_row.partner) %>">
+  <td class="<%= quota_column_class(request_row.total_items, request_row.partner) %> text-right">
     <%= request_row.total_items %>
     <%= quota_display(request_row.partner) %>
   </td>
diff --git a/app/views/requests/index.html.erb b/app/views/requests/index.html.erb
@@ -104,7 +104,7 @@
                 <th style="width: 10px">Date</th>
                 <th>Request was sent by:</th>
                 <th>Request Sender</th>
-                <th># of Items (Request Limit)</th>
+                <th class="text-right"># of Items (Request Limit)</th>
                 <th>Comments</th>
                 <th>Type</th>
                 <th>Status</th>
diff --git a/app/views/storage_locations/_storage_location_row.html.erb b/app/views/storage_locations/_storage_location_row.html.erb
@@ -1,7 +1,7 @@
 <tr>
   <td><%= storage_location.name %></td>
   <td><%= storage_location.address %></td>
-  <td><%= storage_location.square_footage %></td>
+  <td class="text-right"><%= storage_location.square_footage %></td>
   <td><%= storage_location.warehouse_type %></td>
   <td class="text-right"><%= @inventory.quantity_for(storage_location: storage_location.id) %></td>
   <td class="text-right"><%= number_to_currency(storage_location.inventory_total_value_in_dollars(@inventory)) %></td>
diff --git a/app/views/storage_locations/index.html.erb b/app/views/storage_locations/index.html.erb
@@ -75,11 +75,11 @@
               <tr>
                 <th>Name</th>
                 <th>Address</th>
-                <th>Square Footage</th>
+                <th class="text-right">Square Footage</th>
                 <th>Warehouse Type</th>
                 <th class="text-right">Total Inventory</th>
                 <th class="text-right">Fair Market Value</th>
-                <th class="text-center">Actions</th>
+                <th class="text-right">Actions</th>
               </tr>
               </thead>
               <tbody>
