diff --git a/app/assets/stylesheets/costs/costs_legacy.css b/app/assets/stylesheets/costs/costs_legacy.css index 6604512447..439d5e96c6 100644 --- a/app/assets/stylesheets/costs/costs_legacy.css +++ b/app/assets/stylesheets/costs/costs_legacy.css @@ -98,10 +98,6 @@ td.comment input { cursor: pointer; } -.budget-table--fieldset{ - margin: 8px 2px; -} - .cost_entry td{ vertical-align: top; padding: 6px 6px; diff --git a/app/views/cost_objects/_form.html.erb b/app/views/cost_objects/_form.html.erb index 808557773c..9bb5676a0c 100644 --- a/app/views/cost_objects/_form.html.erb +++ b/app/views/cost_objects/_form.html.erb @@ -44,8 +44,8 @@ Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. //]]> -
- <%= VariableCostObject.human_attribute_name(:material_budget) %> +
+ <%= VariableCostObject.human_attribute_name(:material_budget) %>
@@ -87,6 +87,15 @@ Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. + <% if User.current.allowed_to?(:view_cost_rates, @project)%> <%end%> - @@ -112,12 +120,12 @@ Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
- <%= link_to_function l(:button_add_budget_item), "materialBudgetItemsForm.add()", {class: "button -with-icon icon-context icon-add"} %> + <%= link_to_function l(:button_add_budget_item), "materialBudgetItemsForm.add()", {class: "button -alt-highlight -with-icon icon-context icon-add"} %>
-
- <%= VariableCostObject.human_attribute_name(:labor_budget) %> +
+ <%= VariableCostObject.human_attribute_name(:labor_budget) %>
+
+
+ + <%= MaterialBudgetItem.human_attribute_name(:description) %> + +
+
+
@@ -98,7 +107,6 @@ Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
@@ -183,7 +191,7 @@ Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
- <%= link_to_function l(:button_add_budget_item), "laborBudgetItemsForm.add()", {class: "button -with-icon icon-context icon-add"} %> + <%= link_to_function l(:button_add_budget_item), "laborBudgetItemsForm.add()", {class: "button -alt-highlight -with-icon icon-context icon-add"} %>