rename .rhtml to .html.erb of app/views/wiki/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@6564 e93f8b46-1217-0410-a6f0-8f06a7374b81

diff --git a/app/views/wiki/show.html.erb b/app/views/wiki/show.html.erb
new file mode 100644 (file)
index 0000000..87b98e4
--- /dev/null
+++ b/app/views/wiki/show.html.erb
@@ -0,0 +1,68 @@
+<div class="contextual">
+<% if @editable %>
+<%= link_to_if_authorized(l(:button_edit), {:action => 'edit', :id => @page.title}, :class => 'icon icon-edit', :accesskey => accesskey(:edit)) if @content.version == @page.content.version %>
+<%= watcher_tag(@page, User.current) %>
+<%= link_to_if_authorized(l(:button_lock), {:action => 'protect', :id => @page.title, :protected => 1}, :method => :post, :class => 'icon icon-lock') if !@page.protected? %>
+<%= link_to_if_authorized(l(:button_unlock), {:action => 'protect', :id => @page.title, :protected => 0}, :method => :post, :class => 'icon icon-unlock') if @page.protected? %>
+<%= link_to_if_authorized(l(:button_rename), {:action => 'rename', :id => @page.title}, :class => 'icon icon-move') if @content.version == @page.content.version %>
+<%= link_to_if_authorized(l(:button_delete), {:action => 'destroy', :id => @page.title}, :method => :delete, :confirm => l(:text_are_you_sure), :class => 'icon icon-del') %>
+<%= link_to_if_authorized(l(:button_rollback), {:action => 'edit', :id => @page.title, :version => @content.version }, :class => 'icon icon-cancel') if @content.version < @page.content.version %>
+<% end %>
+<%= link_to_if_authorized(l(:label_history), {:action => 'history', :id => @page.title}, :class => 'icon icon-history') %>
+</div>
+
+<%= wiki_page_breadcrumb(@page) %>
+
+<% if @content.version != @page.content.version %>
+    <p>
+    <%= link_to(("\xc2\xab " + l(:label_previous)),
+                :action => 'show', :id => @page.title, :project_id => @page.project,
+                :version => (@content.version - 1)) + " - " if @content.version > 1 %>
+    <%= "#{l(:label_version)} #{@content.version}/#{@page.content.version}" %>
+    <%= '(' + link_to(l(:label_diff), :controller => 'wiki', :action => 'diff',
+                      :id => @page.title, :project_id => @page.project,
+                      :version => @content.version) + ')' if @content.version > 1 %> - 
+    <%= link_to((l(:label_next) + " \xc2\xbb"), :action => 'show',
+                :id => @page.title, :project_id => @page.project,
+                :version => (@content.version + 1)) + " - " if @content.version < @page.content.version %>
+    <%= link_to(l(:label_current_version), :action => 'show', :id => @page.title, :project_id => @page.project) %>
+    <br />
+    <em><%= @content.author ? link_to_user(@content.author) : l(:label_user_anonymous)
+         %>, <%= format_time(@content.updated_on) %> </em><br />
+    <%=h @content.comments %>
+    </p>
+    <hr />
+<% end %>
+
+<%= render(:partial => "wiki/content", :locals => {:content => @content}) %>
+
+<%= link_to_attachments @page %>
+
+<% if @editable && authorize_for('wiki', 'add_attachment') %>
+<div id="wiki_add_attachment">
+<p><%= link_to l(:label_attachment_new), {}, :onclick => "Element.show('add_attachment_form'); Element.hide(this); Element.scrollTo('add_attachment_form'); return false;",
+                                             :id => 'attach_files_link' %></p>
+<% form_tag({ :controller => 'wiki', :action => 'add_attachment', :project_id => @project, :id => @page.title }, :multipart => true, :id => "add_attachment_form", :style => "display:none;") do %>
+  <div class="box">
+  <p><%= render :partial => 'attachments/form' %></p>
+  </div>
+<%= submit_tag l(:button_add) %>
+<%= link_to l(:button_cancel), {}, :onclick => "Element.hide('add_attachment_form'); Element.show('attach_files_link'); return false;" %>
+<% end %>
+</div>
+<% end %>
+
+<% other_formats_links do |f| %>
+       <%= f.link_to 'HTML', :url => {:id => @page.title, :version => @content.version} %>
+       <%= f.link_to 'TXT', :url => {:id => @page.title, :version => @content.version} %>
+<% end if User.current.allowed_to?(:export_wiki_pages, @project) %>
+
+<% content_for :header_tags do %>
+  <%= stylesheet_link_tag 'scm' %>
+<% end %>
+
+<% content_for :sidebar do %>
+  <%= render :partial => 'sidebar' %>
+<% end %>
+
+<% html_title h(@page.pretty_title) %>

diff --git a/app/views/wiki/show.rhtml b/app/views/wiki/show.rhtml
deleted file mode 100644 (file)
index 87b98e4..0000000
--- a/app/views/wiki/show.rhtml
+++ /dev/null
@@ -1,68 +0,0 @@
-<div class="contextual">
-<% if @editable %>
-<%= link_to_if_authorized(l(:button_edit), {:action => 'edit', :id => @page.title}, :class => 'icon icon-edit', :accesskey => accesskey(:edit)) if @content.version == @page.content.version %>
-<%= watcher_tag(@page, User.current) %>
-<%= link_to_if_authorized(l(:button_lock), {:action => 'protect', :id => @page.title, :protected => 1}, :method => :post, :class => 'icon icon-lock') if !@page.protected? %>
-<%= link_to_if_authorized(l(:button_unlock), {:action => 'protect', :id => @page.title, :protected => 0}, :method => :post, :class => 'icon icon-unlock') if @page.protected? %>
-<%= link_to_if_authorized(l(:button_rename), {:action => 'rename', :id => @page.title}, :class => 'icon icon-move') if @content.version == @page.content.version %>
-<%= link_to_if_authorized(l(:button_delete), {:action => 'destroy', :id => @page.title}, :method => :delete, :confirm => l(:text_are_you_sure), :class => 'icon icon-del') %>
-<%= link_to_if_authorized(l(:button_rollback), {:action => 'edit', :id => @page.title, :version => @content.version }, :class => 'icon icon-cancel') if @content.version < @page.content.version %>
-<% end %>
-<%= link_to_if_authorized(l(:label_history), {:action => 'history', :id => @page.title}, :class => 'icon icon-history') %>
-</div>
-
-<%= wiki_page_breadcrumb(@page) %>
-
-<% if @content.version != @page.content.version %>
-    <p>
-    <%= link_to(("\xc2\xab " + l(:label_previous)),
-                :action => 'show', :id => @page.title, :project_id => @page.project,
-                :version => (@content.version - 1)) + " - " if @content.version > 1 %>
-    <%= "#{l(:label_version)} #{@content.version}/#{@page.content.version}" %>
-    <%= '(' + link_to(l(:label_diff), :controller => 'wiki', :action => 'diff',
-                      :id => @page.title, :project_id => @page.project,
-                      :version => @content.version) + ')' if @content.version > 1 %> - 
-    <%= link_to((l(:label_next) + " \xc2\xbb"), :action => 'show',
-                :id => @page.title, :project_id => @page.project,
-                :version => (@content.version + 1)) + " - " if @content.version < @page.content.version %>
-    <%= link_to(l(:label_current_version), :action => 'show', :id => @page.title, :project_id => @page.project) %>
-    <br />
-    <em><%= @content.author ? link_to_user(@content.author) : l(:label_user_anonymous)
-         %>, <%= format_time(@content.updated_on) %> </em><br />
-    <%=h @content.comments %>
-    </p>
-    <hr />
-<% end %>
-
-<%= render(:partial => "wiki/content", :locals => {:content => @content}) %>
-
-<%= link_to_attachments @page %>
-
-<% if @editable && authorize_for('wiki', 'add_attachment') %>
-<div id="wiki_add_attachment">
-<p><%= link_to l(:label_attachment_new), {}, :onclick => "Element.show('add_attachment_form'); Element.hide(this); Element.scrollTo('add_attachment_form'); return false;",
-                                             :id => 'attach_files_link' %></p>
-<% form_tag({ :controller => 'wiki', :action => 'add_attachment', :project_id => @project, :id => @page.title }, :multipart => true, :id => "add_attachment_form", :style => "display:none;") do %>
-  <div class="box">
-  <p><%= render :partial => 'attachments/form' %></p>
-  </div>
-<%= submit_tag l(:button_add) %>
-<%= link_to l(:button_cancel), {}, :onclick => "Element.hide('add_attachment_form'); Element.show('attach_files_link'); return false;" %>
-<% end %>
-</div>
-<% end %>
-
-<% other_formats_links do |f| %>
-       <%= f.link_to 'HTML', :url => {:id => @page.title, :version => @content.version} %>
-       <%= f.link_to 'TXT', :url => {:id => @page.title, :version => @content.version} %>
-<% end if User.current.allowed_to?(:export_wiki_pages, @project) %>
-
-<% content_for :header_tags do %>
-  <%= stylesheet_link_tag 'scm' %>
-<% end %>
-
-<% content_for :sidebar do %>
-  <%= render :partial => 'sidebar' %>
-<% end %>
-
-<% html_title h(@page.pretty_title) %>