jro_apps/redmine Commit - r752:19f2853a2ae2

Boards: new message form displayed with no additional request....

Jean-Philippe Lang -

r752:19f2853a2ae2

parent child

Context file:

r752:19f2853a2ae2

Collapse all files

app/views/boards/show.rhtml +13 -1

             <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? %>
             <table class="list">
               <thead><tr>
                 <th><%= l(:field_subject) %></th>
                 <th><%= l(:field_author) %></th>
                 <%= sort_header_tag("#{Message.table_name}.created_on", :caption => l(:field_created_on)) %>
                 <th><%= l(:label_reply_plural) %></th>
                 <%= sort_header_tag("#{Message.table_name}.updated_on", :caption => l(:label_message_last)) %>
               </tr></thead>
               <tbody>
               <% @topics.each do |topic| %>
                 <tr class="<%= cycle 'odd', 'even' %>">
                   <td><%= link_to h(topic.subject), :controller => 'messages', :action => 'show', :board_id => @board, :id => topic %></td>
                   <td align="center"><%= link_to_user topic.author %></td>
                   <td align="center"><%= format_time(topic.created_on) %></td>
                   <td align="center"><%= topic.replies_count %></td>
                   <td>
                   <small>
                     <% if topic.last_reply %>
                     <%= topic.last_reply.author.name %>, <%= format_time(topic.last_reply.created_on) %><br />
                     <%= link_to_message topic.last_reply %>
                     <% end %>
                   </small>
                   </td>
                 </tr>
               <% end %>
               </tbody>
             </table>
             <p><%= pagination_links_full @topic_pages %>
             [ <%= @topic_pages.current.first_item %> - <%= @topic_pages.current.last_item %> / <%= @topic_count %> ]</p>
             <% else %>
             <p class="nodata"><%= l(:label_no_data) %></p>
             <% end %>

app/views/messages/_form.rhtml +1 -1

             <%= error_messages_for 'message' %>
             <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' %>
             <!--[eoform:message]-->
             <span class="tabular">
             <%= render :partial => 'attachments/form' %>
             </div>

app/views/messages/show.rhtml +3 -2

             <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') %>
             <p><%= toggle_link l(:button_reply), "reply", :focus => "reply_content" %></p>
             <div id="reply" style="display:none;">
             <%= error_messages_for 'message' %>
             <% form_for :reply, @reply, :url => {:action => 'reply', :id => @message} do |f| %>
               <p><%= f.text_field :subject, :required => true, :size => 60 %></p>
               <p><%= f.text_area :content, :required => true, :cols => 80, :rows => 10 %></p>
               <p><%= submit_tag l(:button_submit) %></p>
             <% end %>
             </div>
             <% end %>

General Comments 0

Write
Preview

You need to be logged in to leave comments. Login now

No TODOs yet

	Site-wide shortcuts
/	Use quick search box
g h	Goto home page
g g	Goto my private gists page
g G	Goto my public gists page
g 0-9	Goto bookmarked items from 0-9
n r	New repository page
n g	New gist page

	Repositories
g s	Goto summary page
g c	Goto changelog page
g f	Goto files page
g F	Goto files page with file search activated
g p	Goto pull requests page
g o	Goto repository settings
g O	Goto repository access permissions settings
t s	Toggle sidebar on some pages