<div class="col-md-3" style="word-break:break-all;">
<h4 class="panel-title">
<a class="component-detail-panel" data-toggle="collapse" href="#collapse<%= i %>">
- <%= current_obj.label %> <span class="caret"></span>
+ <%= current_obj.label %> <span class="caret" href="#collapse<%= i %>"></span>
</a>
</h4>
</div>
<% else %>
<% walltime = current_obj.walltime %>
<% cputime = current_obj.cputime %>
+ <% runningtime = current_obj.runningtime %>
<div class="col-md-3">
<% if walltime and cputime %>
- <%= render_runtime(walltime, false) %>
- <% if cputime > 0 %> / <%= render_runtime(cputime, false) %> (<%= (cputime/walltime).round(1) %>⨯)<% end %>
+ <%= render_runtime([walltime, runningtime].max, false) %>
+ <% if cputime > 0 %> / <%= render_runtime(cputime, false) %> (<%= (cputime/runningtime).round(1) %>⨯)<% end %>
<% end %>
</div>
<% if current_obj.can_cancel? and @object.editable? %>
<%= form_tag "#{current_obj.uri}/cancel", remote: true, style: "display:inline; padding-left: 1em" do |f| %>
<%= hidden_field_tag :return_to, url_for(@object) %>
- <%= button_tag "Cancel", {class: 'btn btn-xs btn-danger', id: "cancel-child-button"} %>
+ <%= button_tag "Cancel", {class: 'btn btn-xs btn-warning', id: "cancel-child-button"} %>
<% end %>
<% end %>
</div>
</div>
</div>
- <% name = if current_obj.respond_to?('name') then current_obj.name else '' end %>
- <% content_url = url_for(controller: :work_units, action: :show_child_component, name: name) %>
- <div id="collapse<%=i%>" class="work-unit-component-detail panel-collapse collapse <%= if expanded then 'in' end %>" content-url="<%=content_url%>" action-data="<%={current_obj_type: current_obj.class.to_s, current_obj: current_obj.proxied, main_obj: @object.uuid}.to_json%>">
+ <% content_url = url_for(controller: :work_units, action: :show_child_component, id: @object.uuid, object_type: @object.class.to_s) %>
+ <div id="collapse<%=i%>" class="work-unit-component-detail panel-collapse collapse <%= if expanded then 'in' end %>" content-url="<%=content_url%>" action-data="<%={current_obj_type: current_obj.class.to_s, current_obj_uuid: current_obj.uuid, current_obj_name: current_obj.label, current_obj_parent: current_obj.parent}.to_json%>">
<div class="panel-body work-unit-component-detail-body">
</div>
</div>