diff --git a/app/controllers/projects_controller.rb b/app/controllers/projects_controller.rb
index 536ea6bba..b9e46daee 100644
--- a/app/controllers/projects_controller.rb
+++ b/app/controllers/projects_controller.rb
@@ -348,7 +348,7 @@ class ProjectsController < ApplicationController
if !params[:mail].blank? && User.find_by_mail(params[:mail].to_s).nil?
email = params[:mail]
Mailer.run.send_invite_in_project(email, @project, User.current)
- @is_zhuce =false
+ @is_zhuce = false
flash[:notice] = l(:notice_email_sent, :value => email)
elsif !User.find_by_mail(params[:mail].to_s).nil?
user = User.find_by_mail(params[:mail].to_s)
diff --git a/app/views/issues/_form.html.erb b/app/views/issues/_form.html.erb
index 4cd370adc..fb087a47c 100644
--- a/app/views/issues/_form.html.erb
+++ b/app/views/issues/_form.html.erb
@@ -5,12 +5,10 @@
<% 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 => "w90"
- %>
+ <%= 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 => "w90" %>
<% end %>
@@ -31,11 +29,10 @@
<% if @issue.safe_attribute? 'subject' %>
<%= f.text_field :subject,
- :class => "w583",
- :maxlength => 255,
- :style => "font-size:small",
- :no_label => true
- %>
+ :class => "w576",
+ :maxlength => 255,
+ :style => "font-size:small",
+ :no_label => true %>
<%= javascript_tag do %>
observeAutocompleteField('issue_subject',
@@ -55,15 +52,16 @@
<%= 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,
- :rows => (@issue.description.blank? ? 10 : [[10, @issue.description.length / 50].max, 100].min),
- :accesskey => accesskey(:edit),
- :class => "w583",
- :no_label => true %>
+ <%= content_tag 'span', :id => "issue_description_and_toolbar" do %>
+ <%= f.kindeditor :description,:editor_id => "issue_desc_editor",
+ # :rows => (@issue.description.blank? ? 10 : [[10, @issue.description.length / 50].max, 100].min),
+ # :accesskey => accesskey(:edit),
+ # :class => "w583",
+ :width=>'87%',
+ :resizeType => 0,
+ :no_label => true %>
<% end %>
-
- <%= wikitoolbar_for 'issue_description' %>
+ <%#= wikitoolbar_for 'issue_description' %>
<% end %>
@@ -96,20 +94,20 @@
-
-
-
- <%#= link_to "",
+
+
+
+ <%#= link_to "",
# {:controller => 'watchers', :action => 'new', :project_id => @issue.project},
# :remote => true,
# :method => 'get',
:class => "pic_sch mt5 ml5" %>
-
+
<%#= javascript_tag "observeSearchfield('user_search', 'users_for_watcher', '#{ escape_javascript watchers_autocomplete_for_user_path(:user => @available_watchers, :format => 'js', :flag => 'ture') }')" %>
-
-
-
+
+
+
<%= call_hook(:view_issues_form_details_bottom, {:issue => @issue, :form => f}) %>
diff --git a/app/views/issues/new.html.erb b/app/views/issues/new.html.erb
index 137e203ef..77f3baf31 100644
--- a/app/views/issues/new.html.erb
+++ b/app/views/issues/new.html.erb
@@ -1,3 +1,4 @@
+<%= javascript_include_tag "/assets/kindeditor/kindeditor" %>
<%= l(:label_issue_new) %>
@@ -10,7 +11,7 @@
<%= render :partial => 'issues/form', :locals => {:f => f} %>
-
+
<%= l(:button_create) %>
<%#= preview_link preview_new_issue_path(:project_id => @project), 'issue-form', 'preview', {:class => "blue_btn fl ml10"} %>
diff --git a/app/views/issues/show.html.erb b/app/views/issues/show.html.erb
index 112b64745..88bbb4a71 100644
--- a/app/views/issues/show.html.erb
+++ b/app/views/issues/show.html.erb
@@ -1,3 +1,4 @@
+<%= javascript_include_tag "/assets/kindeditor/kindeditor" %>
<%= l(:label_issue_edit) %>
@@ -32,7 +33,7 @@
<% if @issue.description? || @issue.attachments.any? -%>
<% if @issue.description? %>
<%#= link_to l(:button_quote), quoted_issue_path(@issue.id), :remote => true, :method => 'post', :class => 'icon icon-comment' if authorize_for('issues', 'edit') %>
- <%= textilizable @issue, :description, :attachments => @issue.attachments %>
+ <%= textAreailizable @issue, :description, :attachments => @issue.attachments %>
<% end %>
@@ -108,7 +109,7 @@
-
+
<%= l(:button_submit) %>
<% end %>
diff --git a/public/stylesheets/public.css b/public/stylesheets/public.css
index 586704d16..6961b23c8 100644
--- a/public/stylesheets/public.css
+++ b/public/stylesheets/public.css
@@ -93,6 +93,7 @@ h4{ font-size:14px; color:#3b3b3b;}
.w520{ width:520px;}
.w543{ width:543px;}
.w557{ width:557px;}
+.w576{ width:576px;}
.w583{ width:583px;}
.w350{ width:350px;}
.w610{ width:610px;}