mirrors/notebook
3
0
Fork 0
mirror of https://github.com/indentlabs/notebook.git synced 2025-10-26 11:19:22 +00:00
Code Issues Packages Projects Releases Wiki Activity

bring back description to general tab on equipment?

Browse Source
This commit is contained in:
Andrew Brown 2013-04-20 19:50:57 -05:00
parent 2743fa5d51
commit aebd72dad6
4 changed files with 9 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
app/views/equipment/_edit_form.html.erb
View File

@ -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">

6
app/views/equipment/_form.html.erb
View File

@ -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">

2
app/views/equipment/index.html.erb
View File

@ -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' %>

2
app/views/equipment/show.html.erb
View File

@ -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>