[#6636] Change deliverable finance report to show two table per row
This commit is contained in:
@@ -180,15 +180,4 @@ module ContractsHelper
|
|||||||
''
|
''
|
||||||
end
|
end
|
||||||
end
|
end
|
||||||
|
|
||||||
# Simple calculator to dynamically figure out the css width %
|
|
||||||
# to fill a container. <100% is used to allow some padding.
|
|
||||||
def css_width_calculator(number_of_elements)
|
|
||||||
case number_of_elements
|
|
||||||
when 2
|
|
||||||
" width: 48%"
|
|
||||||
when 3
|
|
||||||
" width: 31%"
|
|
||||||
end
|
|
||||||
end
|
|
||||||
end
|
end
|
||||||
|
|||||||
@@ -9,7 +9,7 @@
|
|||||||
|
|
||||||
<% has_categories = deliverable.project.issue_categories.count > 0 %>
|
<% has_categories = deliverable.project.issue_categories.count > 0 %>
|
||||||
|
|
||||||
<div id="deliverable-activities" class="deliverable-finance-report" style="<%= css_width_calculator( has_categories ? 3 : 2) %>">
|
<div id="deliverable-activities" class="deliverable-finance-report" style=" width: 48%">
|
||||||
<h3>Activities</h3>
|
<h3>Activities</h3>
|
||||||
|
|
||||||
<table id="deliverable-labor-activities" class="striped-contract-style">
|
<table id="deliverable-labor-activities" class="striped-contract-style">
|
||||||
@@ -115,7 +115,7 @@
|
|||||||
|
|
||||||
</div><%# /div#activities %>
|
</div><%# /div#activities %>
|
||||||
|
|
||||||
<div id="deliverable-users" class="deliverable-finance-report" style="<%= css_width_calculator( has_categories ? 3 : 2) %>" >
|
<div id="deliverable-users" class="deliverable-finance-report" style=" width: 48%" >
|
||||||
<h3>Users</h3>
|
<h3>Users</h3>
|
||||||
|
|
||||||
<table id="deliverable-labor-users" class="striped-contract-style">
|
<table id="deliverable-labor-users" class="striped-contract-style">
|
||||||
@@ -197,7 +197,7 @@
|
|||||||
</div><%# /div.users %>
|
</div><%# /div.users %>
|
||||||
|
|
||||||
<% if has_categories %>
|
<% if has_categories %>
|
||||||
<div id="deliverable-issue-categories" class="deliverable-finance-report" style="<%= css_width_calculator( has_categories ? 3 : 2) %>" >
|
<div id="deliverable-issue-categories" class="deliverable-finance-report" style=" width: 48%" >
|
||||||
<h3>Issue Categories</h3>
|
<h3>Issue Categories</h3>
|
||||||
|
|
||||||
<table id="deliverable-labor-issue-categories" class="striped-contract-style">
|
<table id="deliverable-labor-issue-categories" class="striped-contract-style">
|
||||||
|
|||||||
Reference in New Issue
Block a user