diff --git a/app/views/measurements/_readouts.html.erb b/app/views/measurements/_readouts.html.erb index 683aa1c..dcd6317 100644 --- a/app/views/measurements/_readouts.html.erb +++ b/app/views/measurements/_readouts.html.erb @@ -7,7 +7,7 @@ <% total_width = 3 + @quantities.length %> <%= l(:field_taken_at_date) %> <% @quantities.each do |q| %> - +
<%= link_to '', toggle_column_measurement_path(@measurement, quantity_id: q.id), {class: "icon icon-close", method: :post, remote: true} %> @@ -22,13 +22,14 @@ <% @measurements.each_with_index do |m, index| %> <% row_class = "measurement #{cycle('odd', 'even')}" %> - + <%= format_datetime(m) %> <% @requested_r[index].each do |*, value| %> - <%= format_value(value) %> + <%= format_value(value) %> <% end %> - <%= action_links(m) %> + <%= action_links(m) %> @@ -37,23 +38,24 @@ else rows = 1 end %> - + <%= format_datetime(m) %> <% @requested_r[index].each do |q_name, value| %> - + <%= q_name %>

<%= format_value(value) %>

<% end %> - <%= action_links(m) %> + <%= action_links(m) %> <% next unless @quantities.length > 0 %> <% @extra_r[index].each_slice(@quantities.length).with_index do |values| %> <% values.each do |q_name, value| %> - + <%= q_name %>

<%= format_value(value) %>

diff --git a/app/views/quantities/_index.html.erb b/app/views/quantities/_index.html.erb index d8ed755..38c4a09 100644 --- a/app/views/quantities/_index.html.erb +++ b/app/views/quantities/_index.html.erb @@ -21,7 +21,7 @@ quantity_class += " project idnt idnt-#{level+1}" %> - <%= q.name %> + <%= q.name %> <% [:up, :down, :left, :right].each do |direction| %> <%= @@ -40,7 +40,7 @@ <%= q.domain %> <%= q.description %> <%= checked_image q.formula.present? %> - + <%= link_to l(:button_edit), edit_quantity_path(q), { remote: true, class: "icon icon-edit" diff --git a/assets/stylesheets/body_tracking.css b/assets/stylesheets/body_tracking.css index e448e90..c5d3181 100644 --- a/assets/stylesheets/body_tracking.css +++ b/assets/stylesheets/body_tracking.css @@ -9,15 +9,9 @@ table.list .quantity {text-align: left;} table.list .action, table.list .value {text-align: right;} -table.list td.action, -table.list td.date {white-space: nowrap;} - -table.list th {padding-right: 0;} - -table.list th, -table.list td.name, -table.list td.quantity, -table.list td.value { +table.list th.closable {padding-right: 0;} +table.list .unshrinkable {white-space: nowrap;} +table.list .shrinkable { overflow: hidden; text-overflow: ellipsis; white-space: nowrap;