Merge pull request #214 from HDinger/fix/22805-design-issues-on-edit-budget-page

[22805] Design issues on edit budget page

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;

app/views/cost_objects/_form.html.erb

@@ -44,8 +44,8 @@ Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301, USA.
   //]]>
 </script>
 
-<fieldset id="material_budget_items_fieldset" class="budget-table--fieldset">
+<fieldset id="material_budget_items_fieldset" class="form--fieldset -collapsible">
-  <legend><%= VariableCostObject.human_attribute_name(:material_budget) %></legend>
+  <legend class="form--fieldset-legend" onclick="toggleFieldset(this);"><%= VariableCostObject.human_attribute_name(:material_budget) %></legend>
     <div class="generic-table--container">
       <div class="generic-table--results-container">
         <table interactive-table class="generic-table" id="material_budget_items">
@@ -87,6 +87,15 @@ Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301, USA.
                 </div>
               </div>
             </th>
+            <th>
+              <div class="generic-table--sort-header-outer">
+                <div class="generic-table--sort-header">
+                  <span>
+                    <%= MaterialBudgetItem.human_attribute_name(:description) %>
+                  </span>
+                </div>
+              </div>
+            </th>
             <% if User.current.allowed_to?(:view_cost_rates, @project)%>
               <th class="currency" id="material_budget_items_price">
                 <div class="generic-table--sort-header-outer">
@@ -98,7 +107,6 @@ Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301, USA.
                 </div>
               </th>
             <%end%>
-            <th></th>
             <th class="-short"></th>
           </tr>
         </thead>
@@ -112,12 +120,12 @@ Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301, USA.
     </div>
   </div>
   <div class="generic-table--action-buttons">
-    <%= 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"} %>
   </div>
 </fieldset>
 
-<fieldset id="labor_budget_items_fieldset" class="budget-table--fieldset">
+<fieldset id="labor_budget_items_fieldset" class="form--fieldset -collapsible">
-  <legend><%= VariableCostObject.human_attribute_name(:labor_budget) %></legend>
+  <legend class="form--fieldset-legend" onclick="toggleFieldset(this);"><%= VariableCostObject.human_attribute_name(:labor_budget) %></legend>
   <div class="generic-table--container">
     <div class="generic-table--results-container">
       <table interactive-table class="generic-table" id="labor_budget_items">
@@ -183,7 +191,7 @@ Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301, USA.
     </div>
   </div>
   <div class="generic-table--action-buttons">
-    <%= 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"} %>
   </div>
 </fieldset>