4 files changed, 14 insertions, 1 deletions
diff --git a/app/views/issues/_history.rhtml b/app/views/issues/_history.rhtml
index bab37b4fd..edfb9b94d 100644
--- a/app/views/issues/_history.rhtml
+++ b/app/views/issues/_history.rhtml
@@ -8,6 +8,6 @@
 	   <li><%= show_detail(detail) %></li>
 	<% end %>
 	</ul>
-  	<%= textilizable(journal.notes) unless journal.notes.blank? %>
+	<%= render_notes(journal) unless journal.notes.blank? %>
   	<% note_id += 1 %>
 <% end %>
diff --git a/app/views/journals/_notes_form.rhtml b/app/views/journals/_notes_form.rhtml
new file mode 100644
index 000000000..9baec03fa
--- /dev/null
+++ b/app/views/journals/_notes_form.rhtml
@@ -0,0 +1,7 @@
+<% form_remote_tag(:url => {}, :html => { :id => "journal-#{@journal.id}-form" }) do %>
+    <%= text_area_tag :notes, @journal.notes, :class => 'wiki-edit', 
+                                              :rows => (@journal.notes.blank? ? 10 : [[10, @journal.notes.length / 50].max, 100].min) %>
+    <p><%= submit_tag l(:button_save) %>
+    <%= link_to l(:button_cancel), '#', :onclick => "Element.remove('journal-#{@journal.id}-form'); " +
+                                                    "Element.show('journal-#{@journal.id}-notes'); return false;" %></p>
+<% end %>
diff --git a/app/views/journals/edit.rjs b/app/views/journals/edit.rjs
new file mode 100644
index 000000000..798cb0f04
--- /dev/null
+++ b/app/views/journals/edit.rjs
@@ -0,0 +1,3 @@
+page.hide "journal-#{@journal.id}-notes"
+page.insert_html :after, "journal-#{@journal.id}-notes",
+                 :partial => 'notes_form'
diff --git a/app/views/journals/update.rjs b/app/views/journals/update.rjs
new file mode 100644
index 000000000..9da0ebeae
--- /dev/null
+++ b/app/views/journals/update.rjs
@@ -0,0 +1,3 @@
+page.replace "journal-#{@journal.id}-notes", render_notes(@journal)
+page.show "journal-#{@journal.id}-notes"
+page.remove "journal-#{@journal.id}-form"