summaryrefslogtreecommitdiffstats
path: root/app/views/messages
diff options
context:
space:
mode:
authorJean-Philippe Lang <jp_lang@yahoo.fr>2018-09-26 07:27:30 +0000
committerJean-Philippe Lang <jp_lang@yahoo.fr>2018-09-26 07:27:30 +0000
commitb9fa262165601a3b348d22ca1d8da53bda99e55b (patch)
tree21bd632e051addfee01ab7a568b01f5b6428051a /app/views/messages
parentc171797673f549e434dd6b94f7262fd31a77b533 (diff)
downloadredmine-b9fa262165601a3b348d22ca1d8da53bda99e55b.tar.gz
redmine-b9fa262165601a3b348d22ca1d8da53bda99e55b.zip
Adds preview option to the wiki toolbar (#27758).
Patch by Marius BALTEANU. git-svn-id: http://svn.redmine.org/redmine/trunk@17521 e93f8b46-1217-0410-a6f0-8f06a7374b81
Diffstat (limited to 'app/views/messages')
-rw-r--r--app/views/messages/_form.html.erb2
-rw-r--r--app/views/messages/edit.html.erb2
-rw-r--r--app/views/messages/new.html.erb3
-rw-r--r--app/views/messages/show.html.erb2
4 files changed, 1 insertions, 8 deletions
diff --git a/app/views/messages/_form.html.erb b/app/views/messages/_form.html.erb
index d9f48af5c..adba05224 100644
--- a/app/views/messages/_form.html.erb
+++ b/app/views/messages/_form.html.erb
@@ -24,7 +24,7 @@
<p>
<%= label_tag "message_content", l(:description_message_content), :class => "hidden-for-sighted" %>
<%= f.text_area :content, :cols => 80, :rows => 15, :class => 'wiki-edit', :id => 'message_content' %></p>
-<%= wikitoolbar_for 'message_content' %>
+<%= wikitoolbar_for 'message_content', preview_board_message_path(:board_id => @board, :id => @message) %>
<!--[eoform:message]-->
<p><%= l(:label_attachment_plural) %><br />
diff --git a/app/views/messages/edit.html.erb b/app/views/messages/edit.html.erb
index 53948e4da..063676197 100644
--- a/app/views/messages/edit.html.erb
+++ b/app/views/messages/edit.html.erb
@@ -12,6 +12,4 @@
<%= render :partial => 'form',
:locals => {:f => f, :replying => !@message.parent.nil?} %>
<%= submit_tag l(:button_save) %>
- <%= preview_link({:controller => 'messages', :action => 'preview', :board_id => @board, :id => @message}, 'message-form') %>
<% end %>
-<div id="preview" class="wiki"></div>
diff --git a/app/views/messages/new.html.erb b/app/views/messages/new.html.erb
index f8d840694..be6381413 100644
--- a/app/views/messages/new.html.erb
+++ b/app/views/messages/new.html.erb
@@ -3,7 +3,4 @@
<%= form_for @message, :url => {:action => 'new'}, :html => {:multipart => true, :id => 'message-form'} do |f| %>
<%= render :partial => 'form', :locals => {:f => f} %>
<%= submit_tag l(:button_create) %>
- <%= preview_link({:controller => 'messages', :action => 'preview', :board_id => @board}, 'message-form') %>
<% end %>
-
-<div id="preview" class="wiki"></div>
diff --git a/app/views/messages/show.html.erb b/app/views/messages/show.html.erb
index db41b0cc3..5756a9267 100644
--- a/app/views/messages/show.html.erb
+++ b/app/views/messages/show.html.erb
@@ -85,9 +85,7 @@
<%= form_for @reply, :as => :reply, :url => {:action => 'reply', :id => @topic}, :html => {:multipart => true, :id => 'message-form'} do |f| %>
<%= render :partial => 'form', :locals => {:f => f, :replying => true} %>
<%= submit_tag l(:button_submit) %>
- <%= preview_link({:controller => 'messages', :action => 'preview', :board_id => @board}, 'message-form') %>
<% end %>
-<div id="preview" class="wiki"></div>
</div>
<% end %>