]> source.dussan.org Git - redmine.git/commitdiff
rename .rhtml to .html.erb of app/views/wiki/diff.rhtml.
authorToshi MARUYAMA <marutosijp2@yahoo.co.jp>
Wed, 24 Aug 2011 03:57:12 +0000 (03:57 +0000)
committerToshi MARUYAMA <marutosijp2@yahoo.co.jp>
Wed, 24 Aug 2011 03:57:12 +0000 (03:57 +0000)
: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@6569 e93f8b46-1217-0410-a6f0-8f06a7374b81

app/views/wiki/diff.html.erb [new file with mode: 0644]
app/views/wiki/diff.rhtml [deleted file]

diff --git a/app/views/wiki/diff.html.erb b/app/views/wiki/diff.html.erb
new file mode 100644 (file)
index 0000000..ca1a57a
--- /dev/null
@@ -0,0 +1,27 @@
+<div class="contextual">
+<%= link_to(l(:label_history), {:action => 'history', :id => @page.title},
+            :class => 'icon icon-history') %>
+</div>
+
+<%= wiki_page_breadcrumb(@page) %>
+
+<h2><%= h(@page.pretty_title) %></h2>
+
+<p>
+<%= l(:label_version) %> <%= link_to @diff.content_from.version, :action => 'show', :id => @page.title, :project_id => @page.project, :version => @diff.content_from.version %>
+<em>(<%= @diff.content_from.author ?
+             @diff.content_from.author.name : l(:label_user_anonymous)
+      %>, <%= format_time(@diff.content_from.updated_on) %>)</em>
+&#8594;
+<%= l(:label_version) %> <%= link_to @diff.content_to.version, :action => 'show',
+                             :id => @page.title, :project_id => @page.project,
+                             :version => @diff.content_to.version
+                          %>/<%= @page.content.version %>
+<em>(<%= @diff.content_to.author ?
+             link_to_user(@diff.content_to.author.name) : l(:label_user_anonymous)
+      %>, <%= format_time(@diff.content_to.updated_on) %>)</em>
+</p>
+
+<div class="text-diff">
+<%= simple_format_without_paragraph @diff.to_html %>
+</div>
diff --git a/app/views/wiki/diff.rhtml b/app/views/wiki/diff.rhtml
deleted file mode 100644 (file)
index ca1a57a..0000000
+++ /dev/null
@@ -1,27 +0,0 @@
-<div class="contextual">
-<%= link_to(l(:label_history), {:action => 'history', :id => @page.title},
-            :class => 'icon icon-history') %>
-</div>
-
-<%= wiki_page_breadcrumb(@page) %>
-
-<h2><%= h(@page.pretty_title) %></h2>
-
-<p>
-<%= l(:label_version) %> <%= link_to @diff.content_from.version, :action => 'show', :id => @page.title, :project_id => @page.project, :version => @diff.content_from.version %>
-<em>(<%= @diff.content_from.author ?
-             @diff.content_from.author.name : l(:label_user_anonymous)
-      %>, <%= format_time(@diff.content_from.updated_on) %>)</em>
-&#8594;
-<%= l(:label_version) %> <%= link_to @diff.content_to.version, :action => 'show',
-                             :id => @page.title, :project_id => @page.project,
-                             :version => @diff.content_to.version
-                          %>/<%= @page.content.version %>
-<em>(<%= @diff.content_to.author ?
-             link_to_user(@diff.content_to.author.name) : l(:label_user_anonymous)
-      %>, <%= format_time(@diff.content_to.updated_on) %>)</em>
-</p>
-
-<div class="text-diff">
-<%= simple_format_without_paragraph @diff.to_html %>
-</div>