Redmine/body_tracking
Archived
1
0
Fork 0
Code Releases Activity

Removed rowspans

Browse Source
This commit is contained in:
cryptogopher 2019-10-31 23:08:04 +01:00
parent 526a4b1fe6
commit 611b2b799d
2 changed files with 9 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

15
app/views/ingredients/nutrients.html.erb
View File

@ -43,7 +43,7 @@
</tr> </tr>
<tr class="<%= row_class %>" style="display:none"> <tr class="<%= row_class %>" style="display:none">
<td class="name" rowspan="2"> <td class="name">
<%= link_to '', '#', { <%= link_to '', '#', {
onclick: "$(this).closest('tr').prev('tr.primary').toggle(); $(this).closest('tr').prev('tr.primary').nextUntil('tr.primary', 'tr').toggle(); return false;", onclick: "$(this).closest('tr').prev('tr.primary').toggle(); $(this).closest('tr').prev('tr.primary').nextUntil('tr.primary', 'tr').toggle(); return false;",
class: "icon icon-bullet-open" class: "icon icon-bullet-open"
@ -57,6 +57,7 @@
<% end %> <% end %>
</tr> </tr>
<tr class="<%= row_class %>" style="display:none"> <tr class="<%= row_class %>" style="display:none">
<td class="space"></td>
<% @primary_quantities.each do |q| %> <% @primary_quantities.each do |q| %>
<td class="primary value"> <td class="primary value">
<%= values[q.id] || '-' %> <%= values[q.id] || '-' %>
@ -67,26 +68,26 @@
<% extras = @extra_nutrients[i].keys %> <% extras = @extra_nutrients[i].keys %>
<% extras.each_slice(@primary_quantities.length).with_index do |names, index| %> <% extras.each_slice(@primary_quantities.length).with_index do |names, index| %>
<tr class="extra <%= row_class %>" style="display:none"> <tr class="extra <%= row_class %>" style="display:none">
<% if index == 0 %> <td class="space"></td>
<td rowspan="<%= 2*(extras.length.to_d / @primary_quantities.length).ceil %>"
class="space">
</td>
<% end %>
<% names.each do |name| %> <% names.each do |name| %>
<td class="extra quantity"> <td class="extra quantity">
<%= name %> <%= name %>
</td> </td>
<% end %> <% end %>
<% if @primary_quantities.length > names.length %> <% if @primary_quantities.length > names.length %>
<td rowspan="2" colspan="<%= @primary_quantities.length-names.length %>"></td> <td class="space" colspan="<%= @primary_quantities.length-names.length %>"></td>
<% end %> <% end %>
</tr> </tr>
<tr class="extra <%= row_class %>" style="display:none"> <tr class="extra <%= row_class %>" style="display:none">
<td class="space"></td>
<% names.each do |name| %> <% names.each do |name| %>
<td class="extra value"> <td class="extra value">
<%= @extra_nutrients[i][name] %> <%= @extra_nutrients[i][name] %>
</td> </td>
<% end %> <% end %>
<% if @primary_quantities.length > names.length %>
<td class="space" colspan="<%= @primary_quantities.length-names.length %>"></td>
<% end %>
</tr> </tr>
<% end %> <% end %>

2
assets/stylesheets/body_tracking.css
View File

@ -1,7 +1,7 @@
table.list tr.quantity.primary td.name {font-weight: bold;} table.list tr.quantity.primary td.name {font-weight: bold;}
table.nutrients.list td.name, table.nutrients.list td.name,
table.nutrients.list td.quantity {text-align: left; border-bottom: none;} table.nutrients.list td.quantity {text-align: left; border-bottom: none;}
table.nutrients.list td.space, table.nutrients.list td.space {border-top: none; border-bottom: none;}
table.nutrients.list td.value {border-top: none;} table.nutrients.list td.value {border-top: none;}
table.list tr.ingredient.hidden {opacity: 0.4} table.list tr.ingredient.hidden {opacity: 0.4}
table.list td.action, table.list td.action,