scinote-eln/scinote-web
1
1
Fork 0
mirror of https://github.com/scinote-eln/scinote-web.git synced 2024-11-11 01:44:34 +08:00
Code Issues Projects Releases Packages Wiki Activity

Restyle step table display in reports so

Browse source 
Closes SCI-546.
This commit is contained in:
Luka Murn 2016-12-19 15:09:49 +01:00
parent 310b61ec12
commit a48eaf662e
2 changed files with 26 additions and 8 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

16
app/assets/stylesheets/reports.scss
View file

@ -309,17 +309,33 @@ ul {
border-bottom: none;
height: 0;
.result-name-container {
max-width: 570px;
}
.result-icon {
display: inline-block;
margin-left: 15px;
}
.result-name {
display: inline-block;
margin-left: 5px;
}
.user-time {
display: inline-block;
}
}
&:hover > .report-element-header {
color: $color-theme-primary;
}
.report-element-body {
clear: left;
padding-top: 10px !important;
}
}
/* Result asset element style */

18
app/views/reports/elements/_result_table_element.html.erb
View file

@ -6,14 +6,16 @@
<div class="report-element report-result-element report-result-table-element" data-ts="<%= timestamp.to_i %>" data-type="result_table" data-id="<%= result.id %>" data-modal-title="<%=t "projects.reports.elements.modals.result_contents.head_title", result: result.name %>" data-name="<%= name %>" data-icon-class="glyphicon-th">
<div class="report-element-header">
<div class="row">
<div class="pull-left result-icon">
<span class="glyphicon glyphicon-th"></span>
</div>
<div class="pull-left result-name">
<%= name %>
</div>
<div class="pull-left user-time">
<%=t "projects.reports.elements.result_table.user_time", user: result.user.full_name , timestamp: l(timestamp, format: :full) %>
<div class="pull-left result-name-container">
<div class="result-icon">
<span class="glyphicon glyphicon-th"></span>
</div>
<div class="result-name">
<%= name %>
</div>
<div class="user-time">
<%=t "projects.reports.elements.result_table.user_time", user: result.user.full_name , timestamp: l(timestamp, format: :full) %>
</div>
</div>
<div class="pull-right controls">
<%= render partial: "reports/elements/element_controls.html.erb" %>