From 6b5cb85b11b4e9e6c49c3cc4217a9cba31a4b958 Mon Sep 17 00:00:00 2001
From: cryptogopher <git6453hub@michalczyk.pro>
Date: Mon, 20 Apr 2020 22:07:10 +0200
Subject: [PATCH] Buttons/amount in separate columns

---
 app/helpers/meals_helper.rb    | 11 -----------
 app/views/meals/_show.html.erb | 25 +++++++++++++++++--------
 2 files changed, 17 insertions(+), 19 deletions(-)

diff --git a/app/helpers/meals_helper.rb b/app/helpers/meals_helper.rb
index 835aaf5..2702908 100644
--- a/app/helpers/meals_helper.rb
+++ b/app/helpers/meals_helper.rb
@@ -5,17 +5,6 @@ module MealsHelper
     delete_link(meal_path(m), {remote: true, data: {}})
   end
 
-  def adjust_ingredient_links(i)
-    {'- -' => -10, '-' => -1, nil => 0, '+' => 1, '++' => 10}.map do |text, value|
-      if text
-        link_to text, adjust_ingredient_path(i, adjustment: value),
-          {remote: true, method: :post, class: "button #{value>0 ? 'green' : 'red'}"}
-      else
-        yield.to_s
-      end
-    end.reduce(:+)
-  end
-
   def display_notes(m)
     content_tag(:span, m.notes) +
     link_to(l(:button_notes), edit_notes_meal_path(m),
diff --git a/app/views/meals/_show.html.erb b/app/views/meals/_show.html.erb
index 932ad77..c1ba01d 100644
--- a/app/views/meals/_show.html.erb
+++ b/app/views/meals/_show.html.erb
@@ -10,20 +10,29 @@
         {remote: true, method: :post, class: "icon icon-time"} %>
     <% end %>
   </td>
-  <td id="notes-<%= m.id %>" class="notes" style="text-align: left; border-left: none;">
-    <%= display_notes(m) %>
-  </td>
+  <td id="notes-<%= m.id %>" class="notes" style="text-align: left; border-left: none;"
+    colspan="4"><%= display_notes(m) %></td>
   <td class="action" style="width: 5%;"><%= meal_links(m) %></td>
 </tr>
 
 <% m.ingredients.each do |i| %>
   <tr id="ingredient-<%= i.id %>" class="ingredient project idnt idnt-2 buttonable">
-    <td class="name unwrappable" style="width: 5%;">
-      <%= i.food.name %>
-    </td>
-    <td class="amount unwrappable" style="text-align: left;" colspan="2">
-      <%= adjust_ingredient_links(i) { raw "&emsp;<span>#{i.amount}</span>&emsp;" } %>
+    <td class="name unwrappable" style="width: 5%;"><%= i.food.name %></td>
+    <td class="unwrappable" style="width: 1%;">
+      <% {'- -' => -10, '-' => -1, nil => 0, '+' => 1, '++' => 10}.map do |text, value| %>
+        <% if text %>
+          <%= link_to text, adjust_ingredient_path(i, adjustment: value),
+            {remote: true, method: :post, class: "button #{value>0 ? 'green' : 'red'}"} %>
+        <% else %>
+        </td>
+        <td class="amount unwrappable" style="width: 1%; text-align: right;">
+          <span><%= i.amount %></span>[<%= i.food.ref_unit.shortname %>]
+        </td>
+        <td class="unwrappable" style="width: 1%;">
+      <% end %>
+    <% end %>
     </td>
+    <td></td>
   </tr>
 <% end %>
 </tr>