diff options
Diffstat (limited to 'app/views')
-rw-r--r-- | app/views/boards/show.rhtml | 10 | ||||
-rw-r--r-- | app/views/messages/edit.rhtml | 10 | ||||
-rw-r--r-- | app/views/messages/new.rhtml | 11 | ||||
-rw-r--r-- | app/views/messages/show.rhtml | 14 |
4 files changed, 39 insertions, 6 deletions
diff --git a/app/views/boards/show.rhtml b/app/views/boards/show.rhtml index 01db0854c..54645622e 100644 --- a/app/views/boards/show.rhtml +++ b/app/views/boards/show.rhtml @@ -8,11 +8,19 @@ <div id="add-message" style="display:none;"> <h2><%= link_to h(@board.name), :controller => 'boards', :action => 'show', :project_id => @project, :id => @board %> » <%= l(:label_message_new) %></h2> -<% form_for :message, @message, :url => {:controller => 'messages', :action => 'new', :board_id => @board}, :html => {:multipart => true} do |f| %> +<% form_for :message, @message, :url => {:controller => 'messages', :action => 'new', :board_id => @board}, :html => {:multipart => true, :id => 'message-form'} do |f| %> <%= render :partial => 'messages/form', :locals => {:f => f} %> <p><%= submit_tag l(:button_create) %> + <%= link_to_remote l(:label_preview), + { :url => { :controller => 'messages', :action => 'preview', :board_id => @board }, + :method => 'post', + :update => 'preview', + :with => "Form.serialize('message-form')", + :complete => "Element.scrollTo('preview')" + }, :accesskey => accesskey(:preview) %> | <%= link_to l(:button_cancel), "#", :onclick => 'Element.hide("add-message")' %></p> <% end %> +<div id="preview" class="wiki"></div> </div> <h2><%=h @board.name %></h2> diff --git a/app/views/messages/edit.rhtml b/app/views/messages/edit.rhtml index dcc59a396..56e708620 100644 --- a/app/views/messages/edit.rhtml +++ b/app/views/messages/edit.rhtml @@ -1,6 +1,14 @@ <h2><%= link_to h(@board.name), :controller => 'boards', :action => 'show', :project_id => @project, :id => @board %> » <%=h @message.subject %></h2> -<% form_for :message, @message, :url => {:action => 'edit'}, :html => {:multipart => true} do |f| %> +<% form_for :message, @message, :url => {:action => 'edit'}, :html => {:multipart => true, :id => 'message-form'} do |f| %> <%= render :partial => 'form', :locals => {:f => f, :replying => !@message.parent.nil?} %> <%= submit_tag l(:button_save) %> + <%= link_to_remote l(:label_preview), + { :url => { :controller => 'messages', :action => 'preview', :board_id => @board }, + :method => 'post', + :update => 'preview', + :with => "Form.serialize('message-form')", + :complete => "Element.scrollTo('preview')" + }, :accesskey => accesskey(:preview) %> <% end %> +<div id="preview" class="wiki"></div> diff --git a/app/views/messages/new.rhtml b/app/views/messages/new.rhtml index 5c688f465..050c13284 100644 --- a/app/views/messages/new.rhtml +++ b/app/views/messages/new.rhtml @@ -1,6 +1,15 @@ <h2><%= link_to h(@board.name), :controller => 'boards', :action => 'show', :project_id => @project, :id => @board %> » <%= l(:label_message_new) %></h2> -<% form_for :message, @message, :url => {:action => 'new'}, :html => {:multipart => true} do |f| %> +<% form_for :message, @message, :url => {:action => 'new'}, :html => {:multipart => true, :id => 'message-form'} do |f| %> <%= render :partial => 'form', :locals => {:f => f} %> <%= submit_tag l(:button_create) %> + <%= link_to_remote l(:label_preview), + { :url => { :controller => 'messages', :action => 'preview', :board_id => @board }, + :method => 'post', + :update => 'preview', + :with => "Form.serialize('message-form')", + :complete => "Element.scrollTo('preview')" + }, :accesskey => accesskey(:preview) %> <% end %> + +<div id="preview" class="wiki"></div> diff --git a/app/views/messages/show.rhtml b/app/views/messages/show.rhtml index b9897cb40..632f603ff 100644 --- a/app/views/messages/show.rhtml +++ b/app/views/messages/show.rhtml @@ -31,9 +31,17 @@ <% if !@topic.locked? && authorize_for('messages', 'reply') %> <p><%= toggle_link l(:button_reply), "reply", :focus => 'message_content' %></p> <div id="reply" style="display:none;"> -<% form_for :reply, @reply, :url => {:action => 'reply', :id => @topic}, :html => {:multipart => true} do |f| %> - <%= render :partial => 'form', :locals => {:f => f, :replying => true} %> - <%= submit_tag l(:button_submit) %> +<% form_for :reply, @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) %> + <%= link_to_remote l(:label_preview), + { :url => { :controller => 'messages', :action => 'preview', :board_id => @board }, + :method => 'post', + :update => 'preview', + :with => "Form.serialize('message-form')", + :complete => "Element.scrollTo('preview')" + }, :accesskey => accesskey(:preview) %> <% end %> +<div id="preview" class="wiki"></div> </div> <% end %> |