Merged r1385 and r1426 to r1434 from trunk.

git-svn-id: http://redmine.rubyforge.org/svn/branches/0.7-stable@1437 e93f8b46-1217-0410-a6f0-8f06a7374b81
2008-05-18 16:53:23 +00:00
parent c0db7007fa
commit 729d1176ea
16 changed files with 158 additions and 31 deletions
@@ -21,9 +21,9 @@
        <p><%= time_entry.text_field :hours, :size => 6, :label => :label_spent_time %> <%= l(:field_hours) %></p>
        </div>
        <div class="splitcontentright">
-        <p><%= time_entry.text_field :comments, :size => 40 %></p>
        <p><%= time_entry.select :activity_id, (@activities.collect {|p| [p.name, p.id]}) %></p>
        </div>
+        <p><%= time_entry.text_field :comments, :size => 60 %></p>
        <% end %>
    </fieldset>
    <% end %>