From d1418c25d3ad0886c47df107ee752f2783e7efed Mon Sep 17 00:00:00 2001
From: Eric Davis <edavis@littlestreamsoftware.com>
Date: Tue, 20 May 2008 20:29:55 -0700
Subject: [PATCH] Cleanup of form UI. #1135

---
 app/views/deliverables/_form.html.erb | 19 ++++++++++++-------
 assets/stylesheets/budget.css         |  4 ++--
 2 files changed, 14 insertions(+), 9 deletions(-)

diff --git a/app/views/deliverables/_form.html.erb b/app/views/deliverables/_form.html.erb
index 131b996..83e124f 100644
--- a/app/views/deliverables/_form.html.erb
+++ b/app/views/deliverables/_form.html.erb
@@ -5,7 +5,7 @@
     <%= error_messages_for 'deliverable' %>
     <div class="box">
       <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,
           :cols => 60,
           :rows => (@deliverable.description.blank? ? 10 : [[10, @deliverable.description.length / 50].max, 100].min),
@@ -17,12 +17,13 @@
 
       <div class="splitcontentright">
         <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><%= f.text_field :overhead, :size => 5 %></p>
-        <p><%= f.text_field :materials, :size => 5 %></p>
-        <p><%= f.text_field :profit, :size => 5 %></p>
-        
+        <p><%= f.text_field :overhead, :size => 7 %></p>
+        <p><%= f.text_field :materials, :size => 7 %></p>
+        <p><%= f.text_field :profit, :size => 7 %></p>
+        <%# TODO %>
+        <p>Total Budget:</p>
       </div>
 
       <div style="clear:both;"> </div>
@@ -38,6 +39,10 @@
                        }, :accesskey => accesskey(:preview) %>
 <% 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>
diff --git a/assets/stylesheets/budget.css b/assets/stylesheets/budget.css
index f80baa4..d2e8ce6 100644
--- a/assets/stylesheets/budget.css
+++ b/assets/stylesheets/budget.css
@@ -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.done_ratio table.progress { margin-left:auto; margin-right: auto;}
 
-#deliverable-form .splitcontentleft { width: 72% }
-#deliverable-form .splitcontentright { width: 27% }
\ No newline at end of file
+#deliverable-form .splitcontentleft { width: 62% }
+#deliverable-form .splitcontentright { width: 37% }
\ No newline at end of file