From aebd72dad6a52d33b0d54d2aaad08757de997a42 Mon Sep 17 00:00:00 2001
From: Andrew Brown <drusepth@gmail.com>
Date: Sat, 20 Apr 2013 19:50:57 -0500
Subject: [PATCH] bring back description to general tab on equipment?

---
 app/views/equipment/_edit_form.html.erb | 6 +++---
 app/views/equipment/_form.html.erb      | 6 +++---
 app/views/equipment/index.html.erb      | 2 ++
 app/views/equipment/show.html.erb       | 2 +-
 4 files changed, 9 insertions(+), 7 deletions(-)

diff --git a/app/views/equipment/_edit_form.html.erb b/app/views/equipment/_edit_form.html.erb
index 2e905dcc..84e140cb 100644
--- a/app/views/equipment/_edit_form.html.erb
+++ b/app/views/equipment/_edit_form.html.erb
@@ -12,15 +12,15 @@
       <%= f.text_field :equip_type, :class => 'text_field' %>
     </div>
   </div>
-</div>
-
-<div class="hidden section appearance_section">
   <div class="control-group">
     <%= f.label 'Description', :class => 'control-label' %>
     <div class="controls">
       <%= f.text_area :description, :class => 'text_field', :rows => 3 %>
     </div>
   </div>
+</div>
+
+<div class="hidden section appearance_section">
   <div class="control-group">
     <%= f.label 'Weight', :class => 'control-label' %>
     <div class="controls">
diff --git a/app/views/equipment/_form.html.erb b/app/views/equipment/_form.html.erb
index ae57ad23..30f65a2a 100644
--- a/app/views/equipment/_form.html.erb
+++ b/app/views/equipment/_form.html.erb
@@ -12,15 +12,15 @@
       <%= f.text_field :equip_type, :class => 'text_field', :value => (params[:type_of] || "").capitalize %>
     </div>
   </div>
-</div>
-
-<div class="hidden section appearance_section">
   <div class="control-group">
     <%= f.label 'Description', :class => 'control-label' %>
     <div class="controls">
       <%= f.text_area :description, :class => 'text_field', :rows => 3 %>
     </div>
   </div>
+</div>
+
+<div class="hidden section appearance_section">
   <div class="control-group">
     <%= f.label 'Weight', :class => 'control-label' %>
     <div class="controls">
diff --git a/app/views/equipment/index.html.erb b/app/views/equipment/index.html.erb
index e4d5134c..f05c400e 100644
--- a/app/views/equipment/index.html.erb
+++ b/app/views/equipment/index.html.erb
@@ -6,6 +6,7 @@
     <tr>
       <th><%= model_class.human_attribute_name(:name) %></th>
       <th><%= model_class.human_attribute_name(:type) %></th>
+      <th><%= model_class.human_attribute_name(:description) %></th>
       <th><%=t '.actions', :default => t("helpers.actions") %></th>
     </tr>
   </thead>
@@ -14,6 +15,7 @@
       <tr>
         <td style="width: 260px;"><%= simple_format link_to equipment.name, equipment_path(equipment) %></td>
         <td><%= simple_format equipment.equip_type %></td>
+        <td><%= simple_format equipment.description %></td>
         <td style="width: 130px;">
           <%= link_to t('.view', :default => t("helpers.links.view")),
                       equipment_path(equipment), :class => 'btn btn-mini' %>
diff --git a/app/views/equipment/show.html.erb b/app/views/equipment/show.html.erb
index f2fcd3d1..af889e5b 100644
--- a/app/views/equipment/show.html.erb
+++ b/app/views/equipment/show.html.erb
@@ -5,10 +5,10 @@
 <dl class="dl-horizontal hidden section general_section">
   <%= print_property("Name", @equipment.name, "") %>
   <%= print_property("Type", @equipment.equip_type, "") %>
+  <%= print_property("Description", @equipment.description, "") %>
 </dl>
 
 <dl class="dl-horizontal hidden section appearance_section">
-  <%= print_property("Description", @equipment.description, "") %>
   <%= print_property("Weight", @equipment.weight, "") %>
 </dl>