From: Toshi MARUYAMA <marutosijp2@yahoo.co.jp>
Date: Wed, 24 Aug 2011 06:46:28 +0000 (+0000)
Subject: rename .rhtml to .html.erb of app/views/boards/show.rhtml.
X-Git-Tag: 1.3.0~1377
X-Git-Url: https://source.dussan.org/?a=commitdiff_plain;h=f295d26d198f6299ca5c5737638af39d5f46edeb;p=redmine.git

rename .rhtml to .html.erb of app/views/boards/show.rhtml.

:rhtml and :rxml were finally removed as template handlers at Rails 3.1 RC4.

git-svn-id: svn+ssh://rubyforge.org/var/svn/redmine/trunk@6584 e93f8b46-1217-0410-a6f0-8f06a7374b81
---

diff --git a/app/views/boards/show.html.erb b/app/views/boards/show.html.erb
new file mode 100644
index 000000000..ac4a6fee4
--- /dev/null
+++ b/app/views/boards/show.html.erb
@@ -0,0 +1,73 @@
+<%= breadcrumb link_to(l(:label_board_plural), {:controller => 'boards', :action => 'index', :project_id => @project}) %>
+
+<div class="contextual">
+<%= link_to_if_authorized l(:label_message_new),
+                          {:controller => 'messages', :action => 'new', :board_id => @board},
+                          :class => 'icon icon-add',
+                          :onclick => 'Element.show("add-message"); Form.Element.focus("message_subject"); return false;' %>
+<%= watcher_tag(@board, User.current) %>
+</div>
+
+<div id="add-message" style="display:none;">
+<% if authorize_for('messages', 'new') %>
+<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, :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>
+<% end %>
+</div>
+
+<h2><%=h @board.name %></h2>
+<p class="subtitle"><%=h @board.description %></p>
+
+<% if @topics.any? %>
+<table class="list messages">
+  <thead><tr>
+    <th><%= l(:field_subject) %></th>
+    <th><%= l(:field_author) %></th>
+    <%= sort_header_tag('created_on', :caption => l(:field_created_on)) %>
+    <%= sort_header_tag('replies', :caption => l(:label_reply_plural)) %>
+    <%= sort_header_tag('updated_on', :caption => l(:label_message_last)) %>
+  </tr></thead>  
+  <tbody>
+  <% @topics.each do |topic| %>
+    <tr class="message <%= cycle 'odd', 'even' %> <%= topic.sticky? ? 'sticky' : '' %> <%= topic.locked? ? 'locked' : '' %>">
+      <td class="subject"><%= link_to h(topic.subject), { :controller => 'messages', :action => 'show', :board_id => @board, :id => topic } %></td>
+      <td class="author" align="center"><%= link_to_user(topic.author) %></td>
+      <td class="created_on" align="center"><%= format_time(topic.created_on) %></td>
+      <td class="replies" align="center"><%= topic.replies_count %></td>
+      <td class="last_message">
+        <% if topic.last_reply %>
+        <%= authoring topic.last_reply.created_on, topic.last_reply.author %><br />
+        <%= link_to_message topic.last_reply %>
+        <% end %>
+      </td>
+    </tr>
+  <% end %>
+  </tbody>
+</table>
+<p class="pagination"><%= pagination_links_full @topic_pages, @topic_count %></p>
+<% else %>
+<p class="nodata"><%= l(:label_no_data) %></p>
+<% end %>
+
+<% other_formats_links do |f| %>
+	<%= f.link_to 'Atom', :url => {:key => User.current.rss_key} %>
+<% end %>
+
+<% html_title h(@board.name) %>
+
+<% content_for :header_tags do %>
+    <%= auto_discovery_link_tag(:atom, {:format => 'atom', :key => User.current.rss_key}, :title => "#{@project}: #{@board}") %>
+    <%= stylesheet_link_tag 'scm' %>
+<% end %>
diff --git a/app/views/boards/show.rhtml b/app/views/boards/show.rhtml
deleted file mode 100644
index ac4a6fee4..000000000
--- a/app/views/boards/show.rhtml
+++ /dev/null
@@ -1,73 +0,0 @@
-<%= breadcrumb link_to(l(:label_board_plural), {:controller => 'boards', :action => 'index', :project_id => @project}) %>
-
-<div class="contextual">
-<%= link_to_if_authorized l(:label_message_new),
-                          {:controller => 'messages', :action => 'new', :board_id => @board},
-                          :class => 'icon icon-add',
-                          :onclick => 'Element.show("add-message"); Form.Element.focus("message_subject"); return false;' %>
-<%= watcher_tag(@board, User.current) %>
-</div>
-
-<div id="add-message" style="display:none;">
-<% if authorize_for('messages', 'new') %>
-<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, :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>
-<% end %>
-</div>
-
-<h2><%=h @board.name %></h2>
-<p class="subtitle"><%=h @board.description %></p>
-
-<% if @topics.any? %>
-<table class="list messages">
-  <thead><tr>
-    <th><%= l(:field_subject) %></th>
-    <th><%= l(:field_author) %></th>
-    <%= sort_header_tag('created_on', :caption => l(:field_created_on)) %>
-    <%= sort_header_tag('replies', :caption => l(:label_reply_plural)) %>
-    <%= sort_header_tag('updated_on', :caption => l(:label_message_last)) %>
-  </tr></thead>  
-  <tbody>
-  <% @topics.each do |topic| %>
-    <tr class="message <%= cycle 'odd', 'even' %> <%= topic.sticky? ? 'sticky' : '' %> <%= topic.locked? ? 'locked' : '' %>">
-      <td class="subject"><%= link_to h(topic.subject), { :controller => 'messages', :action => 'show', :board_id => @board, :id => topic } %></td>
-      <td class="author" align="center"><%= link_to_user(topic.author) %></td>
-      <td class="created_on" align="center"><%= format_time(topic.created_on) %></td>
-      <td class="replies" align="center"><%= topic.replies_count %></td>
-      <td class="last_message">
-        <% if topic.last_reply %>
-        <%= authoring topic.last_reply.created_on, topic.last_reply.author %><br />
-        <%= link_to_message topic.last_reply %>
-        <% end %>
-      </td>
-    </tr>
-  <% end %>
-  </tbody>
-</table>
-<p class="pagination"><%= pagination_links_full @topic_pages, @topic_count %></p>
-<% else %>
-<p class="nodata"><%= l(:label_no_data) %></p>
-<% end %>
-
-<% other_formats_links do |f| %>
-	<%= f.link_to 'Atom', :url => {:key => User.current.rss_key} %>
-<% end %>
-
-<% html_title h(@board.name) %>
-
-<% content_for :header_tags do %>
-    <%= auto_discovery_link_tag(:atom, {:format => 'atom', :key => User.current.rss_key}, :title => "#{@project}: #{@board}") %>
-    <%= stylesheet_link_tag 'scm' %>
-<% end %>