diff options
| author | Jean-Philippe Lang <jp_lang@yahoo.fr> | 2007-09-24 19:54:48 +0000 |
|---|---|---|
| committer | Jean-Philippe Lang <jp_lang@yahoo.fr> | 2007-09-24 19:54:48 +0000 |
| commit | 19f2853a2ae2e82467679522c842842628dfa35e (patch) | |
| tree | ef8faa0140ecb6f8cec7cae1b69d862c2d4d75df /app | |
| parent | 24b000fb242eb71c3c55bfaf30039edbbf359c6a (diff) | |
| download | redmine-19f2853a2ae2e82467679522c842842628dfa35e.tar.gz redmine-19f2853a2ae2e82467679522c842842628dfa35e.zip | |
Boards: new message form displayed with no additional request.
git-svn-id: http://redmine.rubyforge.org/svn/trunk@763 e93f8b46-1217-0410-a6f0-8f06a7374b81
Diffstat (limited to 'app')
| -rw-r--r-- | app/views/boards/show.rhtml | 14 | ||||
| -rw-r--r-- | app/views/messages/_form.rhtml | 2 | ||||
| -rw-r--r-- | app/views/messages/show.rhtml | 5 |
3 files changed, 17 insertions, 4 deletions
diff --git a/app/views/boards/show.rhtml b/app/views/boards/show.rhtml index cdb9e772d..0af89fdb7 100644 --- 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 %> » <%= 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 0d1ec7390..e484baf2f 100644 --- 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 3e546ceea..772f0653e 100644 --- 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 %> » <%=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') %> |