diff options
| author | Jean-Philippe Lang <jp_lang@yahoo.fr> | 2011-03-28 20:04:48 +0000 |
|---|---|---|
| committer | Jean-Philippe Lang <jp_lang@yahoo.fr> | 2011-03-28 20:04:48 +0000 |
| commit | 9730ff22257b2f2b8722fa0328dc1fd30567fb68 (patch) | |
| tree | e720b3fbd969b33a29294f164d9f3ce034e23cce /app | |
| parent | bf58ad61e57adcb9ec83af83c030420f1a84973e (diff) | |
| download | redmine-9730ff22257b2f2b8722fa0328dc1fd30567fb68.tar.gz redmine-9730ff22257b2f2b8722fa0328dc1fd30567fb68.zip | |
Adds wiki toolbar to notes editing form (#7899).
git-svn-id: svn+ssh://rubyforge.org/var/svn/redmine/trunk@5240 e93f8b46-1217-0410-a6f0-8f06a7374b81
Diffstat (limited to 'app')
| -rw-r--r-- | app/views/issues/_history.rhtml | 2 | ||||
| -rw-r--r-- | app/views/journals/_notes_form.rhtml | 7 |
2 files changed, 7 insertions, 2 deletions
diff --git a/app/views/issues/_history.rhtml b/app/views/issues/_history.rhtml index 4851e5f22..9c9f78e71 100644 --- a/app/views/issues/_history.rhtml +++ b/app/views/issues/_history.rhtml @@ -17,3 +17,5 @@ </div> <%= call_hook(:view_issues_history_journal_bottom, { :journal => journal }) %> <% end %> + +<% heads_for_wiki_formatter if User.current.allowed_to?(:edit_issue_notes, issue.project) || User.current.allowed_to?(:edit_own_issue_notes, issue.project) %> diff --git a/app/views/journals/_notes_form.rhtml b/app/views/journals/_notes_form.rhtml index 94c710ebd..da0f44fa0 100644 --- a/app/views/journals/_notes_form.rhtml +++ b/app/views/journals/_notes_form.rhtml @@ -1,8 +1,11 @@ <% 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) %> + <%= text_area_tag :notes, @journal.notes, + :id => "journal_#{@journal.id}_notes", + :class => 'wiki-edit', + :rows => (@journal.notes.blank? ? 10 : [[10, @journal.notes.length / 50].max, 100].min) %> <%= call_hook(:view_journals_notes_form_after_notes, { :journal => @journal}) %> <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 %> +<%= wikitoolbar_for "journal_#{@journal.id}_notes" %> |