diff --git a/app/views/issues/_form.html.erb b/app/views/issues/_form.html.erb
index 0f86f466e..185b45444 100644
--- a/app/views/issues/_form.html.erb
+++ b/app/views/issues/_form.html.erb
@@ -9,54 +9,76 @@
<%= labelled_fields_for :issue, @issue do |f| %>
<%= call_hook(:view_issues_form_details_top, { :issue => @issue, :form => f }) %>
+
+ -
+ <% if @issue.safe_attribute? 'tracker_id' %>
+
+ <%= f.select :tracker_id,
+ @issue.project.trackers.collect {|t| [t.name, t.id]},
+ {:required => true, :no_label => true},
+ :onchange => "updateIssueFrom('#{escape_javascript project_issue_form_path(@project, :id => @issue, :format => 'js')}')",
+ :class=> "w150"
+ %>
+ <% end %>
+
-<% if @issue.safe_attribute? 'is_private' %>
-
- <%= f.check_box :is_private, :no_label => true %>
-
-<% end %>
+ -
+ <% if @issue.safe_attribute? 'is_private' %>
+ <%= f.check_box :is_private, :no_label => true ,:class=> "ml30"%>
-<% if @issue.safe_attribute? 'project_id' %>
-
<%= f.select :project_id, project_tree_options_for_select(@issue.allowed_target_projects, :selected => @issue.project), {:required => true},
- :onchange => "updateIssueFrom('#{escape_javascript project_issue_form_path(@project, :id => @issue, :format => 'js')}')" %>
-<% end %>
-<% if @issue.safe_attribute? 'tracker_id' %>
-<%= f.select :tracker_id, @issue.project.trackers.collect {|t| [t.name, t.id]}, {:required => true},
+ <% end %>
+
+
+ -
+ <% if @issue.safe_attribute? 'project_id' %>
+
<%= f.select :project_id, project_tree_options_for_select(@issue.allowed_target_projects, :selected => @issue.project), {:required => true},
:onchange => "updateIssueFrom('#{escape_javascript project_issue_form_path(@project, :id => @issue, :format => 'js')}')" %>
+ <% end %>
+
-<% end %>
-
-
-<% if @issue.safe_attribute? 'subject' %>
-<%= f.text_field :subject, :size => 80, :maxlength => 255, :required => true, :style => "font-size:small" %>
-
-<%= javascript_tag do %>
- observeAutocompleteField('issue_subject', '<%= escape_javascript auto_complete_issues_path(:project_id => @project,:scope => (Setting.cross_project_issue_relations? ? 'all' : nil)) %>',
+ -
+ <% if @issue.safe_attribute? 'subject' %>
+
+ <%= f.text_field :subject,
+ :size => 80,
+ :maxlength => 255,
+ :required => true,
+ :style => "font-size:small",
+ :no_label => true
+ %>
+
+ <%= javascript_tag do %>
+ observeAutocompleteField('issue_subject', '<%= escape_javascript auto_complete_issues_path(:project_id => @project,:scope => (Setting.cross_project_issue_relations? ? 'all' : nil)) %>',
{ select: function(event, ui) {
$('input#issue_subject').val(ui.item.value);
}
});
-<% end %>
+ <% end %>
-<% end %>
+ <% end %>
+
+
+
+ -
+ <% if @issue.safe_attribute? 'description' %>
+
+ <%= f.label_for_field :description, :required => @issue.required_attribute?('description'), :no_label=>true , :class=> "label" %>
+ <%= link_to_function image_tag('edit.png'), '$(this).hide(); $("#issue_description_and_toolbar").show()' unless @issue.new_record? %>
+ <%= content_tag 'span', :id => "issue_description_and_toolbar", :style => (@issue.new_record? ? nil : 'display:none') do %>
+ <%= f.text_area :description,
+ :cols => 60,
+ :rows => (@issue.description.blank? ? 10 : [[10, @issue.description.length / 50].max, 100].min),
+ :accesskey => accesskey(:edit),
+ :class => "w583",
+ :no_label => true %>
+ <% end %>
+
+ <%= wikitoolbar_for 'issue_description' %>
+ <% end %>
+
+
-<% if @issue.safe_attribute? 'description' %>
-
- <%= f.label_for_field :description, :required => @issue.required_attribute?('description') %>
- <%= link_to_function image_tag('edit.png'), '$(this).hide(); $("#issue_description_and_toolbar").show()' unless @issue.new_record? %>
- <%= content_tag 'span', :id => "issue_description_and_toolbar", :style => (@issue.new_record? ? nil : 'display:none') do %>
- <%= f.text_area :description,
- :cols => 60,
- :rows => (@issue.description.blank? ? 10 : [[10, @issue.description.length / 50].max, 100].min),
- :accesskey => accesskey(:edit),
- :class => 'wiki-edit',
- :style => "font-size:small;width:520px;",
- :no_label => true %>
- <% end %>
-
-<%= wikitoolbar_for 'issue_description' %>
-<% end %>
<%= render :partial => 'issues/attributes' %>
@@ -64,3 +86,4 @@
<%= call_hook(:view_issues_form_details_bottom, { :issue => @issue, :form => f }) %>
<% end %>
+
\ No newline at end of file
diff --git a/app/views/issues/new.html.erb b/app/views/issues/new.html.erb
index a2facd5ab..a12d6d335 100644
--- a/app/views/issues/new.html.erb
+++ b/app/views/issues/new.html.erb
@@ -7,10 +7,8 @@
:html => {:id => 'issue-form', :multipart => true} do |f| %>
<%= error_messages_for 'issue' %>
<%= hidden_field_tag 'copy_from', params[:copy_from] if params[:copy_from] %>
-
-
+
<%= render :partial => 'issues/form', :locals => {:f => f} %>
-
<% if @copy_from && @copy_from.attachments.any? %>