Boards: new message form displayed with no additional request.

git-svn-id: http://redmine.rubyforge.org/svn/trunk@763 e93f8b46-1217-0410-a6f0-8f06a7374b81

diff --git a/app/views/boards/show.rhtml b/app/views/boards/show.rhtml
index cdb9e772dc9f7b8b8912da41aa025ee63f5f17aa..0af89fdb7d7f609638b07db161b4c351e96b84b8 100644 (file)
--- a/app/views/boards/show.rhtml
+++ b/app/views/boards/show.rhtml
@@ -1,8 +1,20 @@
 <div class="contextual">
-<%= link_to_if_authorized l(:label_message_new), {:controller => 'messages', :action => 'new', :board_id => @board}, :class => "icon icon-add" %>
+<%= link_to_if_authorized l(:label_message_new),
+                          {:controller => 'messages', :action => 'new', :board_id => @board},
+                          :class => 'icon icon-add',
+                          :onclick => 'Element.show("add-message"); return false;' %>
 <%= watcher_tag(@board, User.current) %>
 </div>
 
+<div id="add-message" style="display:none;">
+<h2><%= link_to h(@board.name), :controller => 'boards', :action => 'show', :project_id => @project, :id => @board %> &#187; <%= l(:label_message_new) %></h2>
+<% form_for :message, @message, :url => {:controller => 'messages', :action => 'new', :board_id => @board}, :html => {:multipart => true} do |f| %>
+  <%= render :partial => 'messages/form', :locals => {:f => f} %>
+  <p><%= submit_tag l(:button_create) %>
+  <%= link_to l(:button_cancel), "#", :onclick => 'Element.hide("add-message")' %></p>
+<% end %>
+</div>
+
 <h2><%=h @board.name %></h2>
 
 <% if @topics.any? %>

diff --git a/app/views/messages/_form.rhtml b/app/views/messages/_form.rhtml
index 0d1ec73903030b3c46bff7027313daf93e7ec97d..e484baf2f2734d2da541c6d56e31b040c5955c65 100644 (file)
--- a/app/views/messages/_form.rhtml
+++ b/app/views/messages/_form.rhtml
@@ -3,7 +3,7 @@
 <div class="box">
 <!--[form:message]-->
 <p><label><%= l(:field_subject) %></label><br />
-<%= f.text_field :subject, :required => true, :size => 80 %></p>
+<%= f.text_field :subject, :required => true, :size => 120 %></p>
 
 <p><%= f.text_area :content, :required => true, :cols => 80, :rows => 15, :class => 'wiki-edit' %></p>
 <%= wikitoolbar_for 'message_content' %>

diff --git a/app/views/messages/show.rhtml b/app/views/messages/show.rhtml
index 3e546ceea8a4d25d8ec8e836c2978626db61c388..772f0653e5822dbb588bae99a42e155285c197b6 100644 (file)
--- a/app/views/messages/show.rhtml
+++ b/app/views/messages/show.rhtml
@@ -1,16 +1,17 @@
 <h2><%= link_to h(@board.name), :controller => 'boards', :action => 'show', :project_id => @project, :id => @board %> &#187; <%=h @message.subject %></h2>
 
-<p><em><%= @message.author.name %>, <%= format_time(@message.created_on) %></em></p>
+<p><span class="author"><%= authoring @message.created_on, @message.author %></span></p>
 <div class="wiki">
 <%= textilizable(@message.content, :attachments => @message.attachments) %>
 </div>
 <%= link_to_attachments @message.attachments, :no_author => true %>
+<br />
 
 <h3 class="icon22 icon22-comment"><%= l(:label_reply_plural) %></h3>
 <% @message.children.each do |message| %>
   <a name="<%= "message-#{message.id}" %>"></a>
   <h4><%=h message.subject %> - <%= message.author.name %>, <%= format_time(message.created_on) %></h4>
-  <div class="wiki"><p><%= textilizable message.content %></p></div>
+  <div class="wiki"><%= textilizable message.content %></div>
 <% end %>
 
 <% if authorize_for('messages', 'reply') %>