Cleanup of form UI. #1135

This commit is contained in:
Eric Davis committed 2008-05-20 20:29:55 -07:00
1 parent f49763c423
commit d1418c25d3
2 files changed
+14 -9

No files matched your search

+12 -7
View File
@@ -5,7 +5,7 @@
<%= error_messages_for 'deliverable' %> <%= error_messages_for 'deliverable' %>
<div class="box"> <div class="box">
<div class="splitcontentleft"> <div class="splitcontentleft">
<p><%= f.text_field :subject, :size => 80, :required => true %></p> <p><%= f.text_field :subject, :size => 65, :required => true %></p>
<p><%= f.text_area :description, :required => true, <p><%= f.text_area :description, :required => true,
:cols => 60, :cols => 60,
:rows => (@deliverable.description.blank? ? 10 : [[10, @deliverable.description.length / 50].max, 100].min), :rows => (@deliverable.description.blank? ? 10 : [[10, @deliverable.description.length / 50].max, 100].min),
@@ -17,12 +17,13 @@
<div class="splitcontentright"> <div class="splitcontentright">
<p>TODO: Fixed cost</p> <p>TODO: Fixed cost</p>
<p><%= f.text_field :cost, :size => 5 %></p> <p><%= f.text_field :cost, :size => 7 %></p>
<p>TODO: Total hours</p> <p>TODO: Total hours</p>
<p><%= f.text_field :overhead, :size => 5 %></p> <p><%= f.text_field :overhead, :size => 7 %></p>
<p><%= f.text_field :materials, :size => 5 %></p> <p><%= f.text_field :materials, :size => 7 %></p>
<p><%= f.text_field :profit, :size => 5 %></p> <p><%= f.text_field :profit, :size => 7 %></p>
<%# TODO %>
<p>Total Budget:</p>
</div> </div>
<div style="clear:both;"> </div> <div style="clear:both;"> </div>
@@ -38,6 +39,10 @@
}, :accesskey => accesskey(:preview) %> }, :accesskey => accesskey(:preview) %>
<% end %> <% end %>
<%= wikitoolbar_for 'deliverable_description' %> <%# Same as `wikitoolbar_for 'deliverable_description'` but without the help link %>
<%= javascript_include_tag('jstoolbar/jstoolbar') %>
<%= javascript_include_tag("jstoolbar/lang/jstoolbar-#{current_language}") %>
<%= javascript_tag("var toolbar = new jsToolBar($('deliverable_description'));toolbar.draw();") %>
<div id="preview" class="wiki"></div> <div id="preview" class="wiki"></div>
+2 -2
View File
@@ -7,5 +7,5 @@ tr.deliverable td.subject, tr.deliverable td.category { white-space: normal; }
tr.deliverable td.subject { text-align: left; } tr.deliverable td.subject { text-align: left; }
tr.deliverable td.done_ratio table.progress { margin-left:auto; margin-right: auto;} tr.deliverable td.done_ratio table.progress { margin-left:auto; margin-right: auto;}
#deliverable-form .splitcontentleft { width: 72% } #deliverable-form .splitcontentleft { width: 62% }
#deliverable-form .splitcontentright { width: 27% } #deliverable-form .splitcontentright { width: 37% }