Skip to content

Commit

Permalink
[webui] fix crash in monitor/old with new rails
Browse files Browse the repository at this point in the history
  • Loading branch information
adrianschroeter committed Jun 4, 2014
1 parent 3c8c23d commit 3f2e1fe
Show file tree
Hide file tree
Showing 2 changed files with 3 additions and 3 deletions.
4 changes: 2 additions & 2 deletions src/api/app/views/webui/monitor/_building.html.erb
Expand Up @@ -12,12 +12,12 @@

<h3>Legend</h3>
<div>
<div style="float: left; margin-right: 10px"><%= distance_of_time_in_words(@time_now, @dead_line, true) -%></div>
<div style="float: left; margin-right: 10px"><%= distance_of_time_in_words(@time_now, @dead_line) -%></div>
<% @max_color.downto(0) do |n| -%>
<% color = "rgb(255,#{n},0)" %>
<div style="background-color: <%= color %>; margin: 0px; width: 3px ; height: 1em; float: left;">&nbsp;</div>
<% end -%>
<div style="float: left; margin-left: 10px"><%= distance_of_time_in_words(@time_now, @dead_line-(@max_color*@interval_steps*60), true) -%></div>
<div style="float: left; margin-left: 10px"><%= distance_of_time_in_words(@time_now, @dead_line-(@max_color*@interval_steps*60)) -%></div>
<div class="clear"/>
</div>
<% else %>
Expand Down
2 changes: 1 addition & 1 deletion src/api/app/views/webui/monitor/_building_table.html.erb
Expand Up @@ -49,7 +49,7 @@
%>
<td class="starttime" <%= raw warning_style if warning_style %> title="start time: <%= start_time.iso8601 %>">
<span style="display: none" class="sorttime"><%= b["starttime"].to_i %></span>
<%= distance_of_time_in_words(@time_now, start_time, true) %>
<%= distance_of_time_in_words(@time_now, start_time) %>
</td>
<td class="uri"><%= b["workerid"] %></td>
<td class="hostarch"><%= b["hostarch"] %></td>
Expand Down

0 comments on commit 3f2e1fe

Please sign in to comment.